Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -2584,7 +2584,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 }
 
                 //有渠道活码
-                if (isWay) {
+                if (isWay && StringUtil.strIsNullOrEmpty(followUser.getRemark()) ) {
                     if (wayId.getIsDescription() == 1) {
                         qwExternalContact.setDescription(wayId.getDescription());
                     }
@@ -2636,7 +2636,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                     }
                 }
                 else {
-                    if (!StringUtil.strIsNullOrEmpty(tagRemark)) {
+                    if (StringUtil.strIsNullOrEmpty(followUser.getRemark()) && !StringUtil.strIsNullOrEmpty(tagRemark)) {
                         qwExternalContact.setRemark(tagRemark + "-" + externalContact.getName());
                         QwExternalContactRemarkParam param = new QwExternalContactRemarkParam();
                         param.setRemark(qwExternalContact.getRemark());
@@ -2652,6 +2652,8 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
 
                         logger.info("修改备注2：{}", remarkResult);
 
+                    }else {
+                        qwExternalContact.setRemark(StringUtil.strIsNullOrEmpty(followUser.getRemark()) ? externalContact.getName() : followUser.getRemark());
                     }
                 }