Merge branch 'developer' into 'master'

Developer

See merge request !202

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

@@ -466,7 +466,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
 
     private String limitIp(HmQrcodeBO hm) {
         String ipKey = "hmadd:limit:ip";
-        int ipLimitCount = 200;
+        int ipLimitCount = 300;
         RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter(ipKey);
         rateLimiter.trySetRate(RateType.OVERALL, ipLimitCount, 1, RateIntervalUnit.SECONDS);
         if (rateLimiter.tryAcquire()) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -151,7 +151,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
                 loginUserDict = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getWxOpenUseId());
             }
             logger.info("伪登录：{}userId:{},loginUser={}", loginStaff.getPhoneNumber(), loginStaff.getWxOpenUseId(), JSONObject.toJSONString(loginUserDict));
-            if (null != loginUserDict) {
+            if (null != loginUserDict && StringUtils.isNotEmpty(loginUserDict.getDictName()) && loginUserDict.getDictName().split(":").length==2) {
                 String dictValue = loginUserDict.getDictValue();
                 List<StaffDTO> staffDTOS = new ArrayList<>();
                 List<StaffDTO> phoneDtos = staffApiService.listByPhoneNumber(dictValue);