Merge remote-tracking branch 'origin/developer' into developer

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

@@ -174,7 +174,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			String newValue = tab.getNewValue();
 			String changeField = tab.getChangeField();
             StoreDTO store = storeService.getStore(storeId);
-            if (store != null) {
+            if (store == null) {
                 return "门店不存在";
             }
             this.editStoreInfo(storeId, changeField, oldValue, newValue);

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) -> {
             //该用户在该商户下打的标签