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

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -150,11 +150,13 @@ public class EnterpriseController extends WebBaseController {
             return;
         }
         list.forEach(one -> {
-            String wxEnterpriseId = one.getWxEnterpriseId();
-            String key = String.format(MEMBER_RELATE_ENT_OPE_KEY, wxEnterpriseId);
-            Object cache = RedisUtil.getCache(key);
-            if (Objects.nonNull(cache)) {
-                one.setOpenMassFlag(Boolean.FALSE);
+            if (one.getOpenMassFlag()) {
+                String wxEnterpriseId = one.getWxEnterpriseId();
+                String key = String.format(MEMBER_RELATE_ENT_OPE_KEY, wxEnterpriseId);
+                Object cache = RedisUtil.getCache(key);
+                if (Objects.nonNull(cache)) {
+                    one.setOpenMassFlag(Boolean.FALSE);
+                }
             }
         });
     }

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

@@ -189,10 +189,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             return false;
         }
         String userid = dto.getUserid();
-        // 当前规则 userId是12位并且以5开头
-        if (userid.length() != 12) {
-            return false;
-        }
+        // 只处理5开头的-不是5开头不同步
         return userid.startsWith("5");
     }