Merge branch 'master_xgh_bug_11月' into 'master_xgh_我的客户迭代'

Master xgh bug 11月

See merge request !392

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanMenuQDTO.java

@@ -47,6 +47,15 @@ public class HaobanMenuQDTO implements Serializable {
 
     private String routePath;
     private String ownerShip;
+    private Integer statusFlag = 1;
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
 
     public String getMenuCode() {
         return menuCode;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

@@ -393,9 +393,9 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
        }else if(type==1) {
            //合并会员,会员会先调删除,在调合并。顺序不能调换
            log.info("合并会员,memberId：{},新memberId={}", memberId , mergeMemberId);
-           tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
-           int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(mergeMemberId, enterpriseId);
+           int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId);
            if (i > 0) {
+               tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
                log.info("会员合并 ,更新为企微好友,新memberId:{}", mergeMemberId);
                this.memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
            }

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -551,10 +551,9 @@
         UPDATE
             tab_haoban_external_clerk_related
         SET member_id=#{memberId},
-            status_flag = 1,
             update_time = now()
         where member_id = #{oldMemberId}
-          and enterprise_id = #{enterpriseId}
+          and enterprise_id = #{enterpriseId} and status_flag = 1
     </update>
 
     <update id="updateStatusByMemberId">