移动润天得过来

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

@@ -2584,7 +2584,8 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                 }
 
                 //有渠道活码
-                if (isWay && StringUtil.strIsNullOrEmpty(followUser.getRemark()) ) {
+                if (isWay && (StringUtil.strIsNullOrEmpty(followUser.getRemark()) || StringUtils.equals(followUser.getRemark().trim(),externalContact.getName().trim()))) {
+
                     if (wayId.getIsDescription() == 1) {
                         qwExternalContact.setDescription(wayId.getDescription());
                     }
@@ -2636,7 +2637,9 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                     }
                 }
                 else {
-                    if (StringUtil.strIsNullOrEmpty(followUser.getRemark()) && !StringUtil.strIsNullOrEmpty(tagRemark)) {
+                    if (!StringUtil.strIsNullOrEmpty(tagRemark) && (StringUtil.strIsNullOrEmpty(followUser.getRemark()) || StringUtils.equals(followUser.getRemark().trim(),externalContact.getName().trim()))) {
+                        // 逻辑代码
+
                         qwExternalContact.setRemark(tagRemark + "-" + externalContact.getName());
                         QwExternalContactRemarkParam param = new QwExternalContactRemarkParam();
                         param.setRemark(qwExternalContact.getRemark());
@@ -2657,8 +2660,6 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                     }
                 }
 
-
-
             }
         }