Merge branch 'master_xgh_pendingid' into 'developer'

Master xgh pendingid

See merge request !308

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

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.common.utils.DingUtils;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
@@ -132,6 +133,7 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	    List<String> list = this.mapper.listNoDepartStaff(wxEnterpriseId, addDate) ;
 	    if(CollectionUtils.isNotEmpty(list)) {
 	        logger.info("修复成员部门,成员数={}",list.size());
+	        DingUtils.send("修复成员部门信息,数量="+list.size(), false);
 	        for(String staffId : list) {
 	            this.repairStaffDepart(staffId);
 	        }
@@ -144,6 +146,9 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
 	    TabHaobanStaff staff =  this.staffMapper.selectByPrimaryKey(staffId) ;
         String wxEnterpriseId = staff.getWxEnterpriseId() ;
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
+        if(null == qwDTO) {
+            return ;
+        }
         String wxUserId = staff.getWxUserId() ;
         if(qwDTO.needOpenUserIdDk()) {
             wxUserId = staff.getWxOpenUseId() ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/QwTimesUtils.java

@@ -62,7 +62,7 @@ public class QwTimesUtils {
     
     public static boolean isLimit(String wxEnterpriseId, String enterpriseId, QwInterfaceLimitEnum qwInterface) {
         QwLimitTimesBO setTimeBO = getSettingTimes(wxEnterpriseId, qwInterface);
-        logger.info("获取配置次数={},wxEnterpriseId={}", JSON.toJSONString(setTimeBO), wxEnterpriseId);
+        logger.info("获取配置次数={},wxEnterpriseId={},{}", JSON.toJSONString(setTimeBO), wxEnterpriseId,enterpriseId);
         // 先判断月
         String interfaceName = qwInterface.getName();
         Date now = new Date();
@@ -70,21 +70,21 @@ public class QwTimesUtils {
         String keyMonth = getCacheKey(wxEnterpriseId, interfaceName, dateStr.substring(0, 6));
         boolean monthResult = timesCheck(1, keyMonth, qwInterface, wxEnterpriseId, enterpriseId, now, setTimeBO);
         if (monthResult) {
-            logger.info("月达到限制={}", keyMonth);
+            logger.info("月达到限制={},{}", keyMonth,enterpriseId);
             return true;
         }
         // 天
         String keyDay = getCacheKey(wxEnterpriseId, interfaceName, dateStr.substring(0, 8));
         boolean dayResult = timesCheck(2, keyDay, qwInterface, wxEnterpriseId, enterpriseId, now, setTimeBO);
         if (dayResult) {
-            logger.info("天达到限制={}", keyDay);
+            logger.info("天达到限制={},{}", keyDay,enterpriseId);
             return true;
         }
         // 小时
         String keyHour = getCacheKey(wxEnterpriseId, interfaceName, dateStr.substring(0, 10));
         boolean hourResult = timesCheck(3, keyHour, qwInterface, wxEnterpriseId, enterpriseId, now, setTimeBO);
         if (hourResult) {
-            logger.info("小时达到限制={}", keyHour);
+            logger.info("小时达到限制={},{}", keyHour,enterpriseId);
             return true;
         }
         return false;