优化全局拉黑提示

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -320,6 +320,8 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
             "            <if test=\"isBindMini == 'noBindMini' \"> and ec.fs_user_id is null </if> \n" +
             "            <if test=\"extId != null\"> and ec.id = #{extId}</if>\n" +
             "            <if test=\"fsUserId != null\"> and ec.fs_user_id = #{fsUserId}</if>\n" +
+            "            <if test=\"manageStatus != null and manageStatus == 1\"> and (fu.manage_status = 1 or fu.manage_status is null) </if>\n" +
+            "            <if test=\"manageStatus != null and manageStatus == 2\"> and fu.manage_status = 2 </if>\n" +
             "            <if test=\"lossTime != null \"> and DATE(ec.loss_time) = DATE(#{lossTime})</if>\n" +
             "            <if test=\"createTime != null \">and DATE(ec.create_time) = DATE(#{createTime})</if>\n" +
             "            <if test=\"delTime != null \"> and DATE(ec.del_time) = DATE(#{delTime})</if>\n" +

fs-service/src/main/java/com/fs/qw/param/QwExternalContactManageParam.java

@@ -14,6 +14,6 @@ public class QwExternalContactManageParam {
     /** 管理状态：1正常 2已被总部拉黑 */
     private Integer manageStatus;
 
-    /** 管理备注（拉黑原因） */
+    /** 管理备注（提示） */
     private String manageRemark;
 }

fs-service/src/main/java/com/fs/qw/param/QwExternalContactParam.java

@@ -180,4 +180,7 @@ public class QwExternalContactParam {
      */
     @TableField(exist = false)
     private Integer addSalesCount;
+
+    /** 管理状态：1正常 2已被总部拉黑 */
+    private Integer manageStatus;
 }

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

@@ -881,9 +881,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         FsUser fsUser = new FsUser();
         fsUser.setUserId(contact.getFsUserId());
         fsUser.setManageStatus(param.getManageStatus());
-        if (param.getManageStatus() == 1) {
-            fsUser.setManageRemark("");
-        } else if (param.getManageRemark() != null) {
+        if (param.getManageRemark() != null) {
             fsUser.setManageRemark(param.getManageRemark());
         }
         return fsUserMapper.updateFsUser(fsUser);