Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxStaffSyncOperation.java

@@ -137,8 +137,8 @@ public class QywxStaffSyncOperation implements BaseSyncOperation {
                 WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
                 String corpid = wxEnterpriseDTO.getCorpid();
                 Integer externalFlag = wxEnterpriseDTO.getExternalFlag();
+                logger.info("同步通讯录完成，批量处理wx_open_user_id，corpid：{},externalFlag:{}", corpid,externalFlag);
                 if (corpid.length() > 20 || externalFlag == 1) {
-                    logger.info("同步通讯录完成，批量处理wx_open_user_id，corpid：{}", corpid);
                     // 限流器
                     RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("haoban:manage3:updateWxOpenUserId:limit");
                     // 每1秒产生5个令牌
@@ -166,8 +166,8 @@ public class QywxStaffSyncOperation implements BaseSyncOperation {
                     }
                 }
                 Integer useridFlag = wxEnterpriseDTO.getUseridFlag();
+                logger.info("同步通讯录完成，批量处理wx_user_id，corpid：{},useridFlag:{}", corpid,useridFlag);
                 if (corpid.length() < 20 && useridFlag == 1) {
-                    logger.info("同步通讯录完成，批量处理wx_user_id，corpid：{}", corpid);
                     // 限流器
                     RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("haoban:manage3:updateWxUserId:limit");
                     // 每1秒产生5个令牌
@@ -187,7 +187,7 @@ public class QywxStaffSyncOperation implements BaseSyncOperation {
                             break;
                         }
                         pageNum++;
-                        logger.info("useridToOpenuserid请求：corpid：{}", corpid);
+                        logger.info("openuseridToUserid 请求：corpid：{}", corpid);
                         List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.getSelfOpenuseridToUserid(tabHaobanWxApplication.getCorpid(), secretSetting.getSecretVal(), tabHaobanWxApplication.getAgentId(), staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
                         if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
                             for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {