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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmClerkRelationServiceImpl.java

@@ -158,7 +158,10 @@ public class HmClerkRelationServiceImpl implements HmClerkRelationService {
         if(null != RedisUtil.getCache(cacheKey)) {
             return ServiceResponse.failure("9999", "已有任务在执行,请稍后在处理") ;
         }
-        int maxCount = 3 ;
+        int maxCount = 100 ;
+        if("fb40256db41142a196b21ccf03e58507".equals(wxEnterpriseId)) {
+            maxCount = 3 ;
+        }
         List<Long> hmIdList = qdto.getHmIdList() ;
         List<TabHaobanHmClerkRelation> list = this.tabHaobanHmClerkRelationMapper.listHmClerkByHmIdList(hmIdList) ;
         log.info("查询活码关联导购数={},活码数={}",list.size(),hmIdList.size());

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

@@ -73,6 +73,9 @@ public class SecretSettingServiceImpl implements SecretSettingService {
             return null;
         }
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if (qwDTO == null) {
+            return null;
+        }
         // 如果是纯自建,使用自建的token
         if(qwDTO.isSelf()) {
             secretType = SecretTypeEnum.SELF_APP.getVal() ;