Merge branch 'developer' into 'master'

会员标签同步-同步状态变更

See merge request !116

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

@@ -540,6 +540,12 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
         //商户下设置同步的企业微信标签keys
         Set<String> entQywxTagSyncKeys = syncTagFormat.getEntQywxTagKeysMap().get(enterpriseId);
+        if (CollectionUtils.isEmpty(entQywxTagSyncKeys)) {
+            logger.info("该商户下没有标签");
+            resp.setCode(6);
+            resp.setMessage("该商户下没有标签");
+            return resp;
+        }
         //同步好友
         externalTagMap.forEach((wxUserId, haveTagKes) -> {
             //该用户在该商户下打的标签