Merge branch 'feature/xgh/0704上线' into 'master'

test

See merge request !1998

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

@@ -1529,7 +1529,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         this.saveExternalClerk(memberId, staffId, unionDTO, staffClerkRelation, statusFlag);
         if(StringUtils.isNotBlank(memberId)) {
-            this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
+            if(null == RedisUtil.getCache("zhuan_self")) {
+                this.pushTagSync(memberId, wxEnterpriseId, enterpriseId);
+            }else {
+                log.info("不同步标签");
+            }
             log.info("通知会员 更新为企微好友 memberId:{}", memberId);
 //            memberApiService.updateMemberQywxFlag(enterpriseId, memberId, 1);
             List<TabHaobanExternalClerkRelated> memberList = externalClerkRelatedService.getAddTimeByMemberId(memberId, enterpriseId,"1");