Merge branch 'master' into developer

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

@@ -307,11 +307,14 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
             //删除会员
             tabHaobanExternalClerkRelatedMapper.updateStatusByMemberId(memberId, enterpriseId);
         } else {
-            //合并会员
-            tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
-            //回调给会员，更新是否为企微好友
-            log.info("通知会员 合并会员后更新为企微好友,memberId:{},mergeMemberId:{}", memberId, mergeMemberId);
-            memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
+            int i = tabHaobanExternalClerkRelatedMapper.countByMemberId(memberId, enterpriseId);
+            if (i > 0) {
+                //合并会员
+                tabHaobanExternalClerkRelatedMapper.updateMemberIdByMemberId(mergeMemberId, memberId, enterpriseId);
+                //回调给会员，更新是否为企微好友
+                log.info("会员合并，有企微好友，通知会员，合并会员后更新为企微好友,memberId:{},mergeMemberId:{}", memberId, mergeMemberId);
+                memberApiService.updateMemberQywxFlag(enterpriseId, mergeMemberId, 1);
+            }
         }
     }