Merge branch 'master' into dev-xym-user-tag

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/XxlJobParam.java

@@ -20,4 +20,6 @@ public class XxlJobParam {
     private List<Long> staffIds;
 
     private Long userId;
+
+    private Integer isAlert;
 }

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComHistoryDataJob.java

@@ -208,8 +208,10 @@ public class WeComHistoryDataJob {
                 selectGroupMsgList(startTime, Math.min(startTime + TimeConstant.DAY, endTime), corp.getId(), xxlJobParam.getStaffId());
             }
         }
-        for (Corp corp : corps) {
-            selectAlertHistoryMessage(xxlJobParam.getStartTime(), xxlJobParam.getEndTime(), corp.getId(), corp.getName());
+        if (xxlJobParam.getIsAlert() != null && xxlJobParam.getIsAlert() == 1) {
+            for (Corp corp : corps) {
+                selectAlertHistoryMessage(xxlJobParam.getStartTime(), xxlJobParam.getEndTime(), corp.getId(), corp.getName());
+            }
         }
         return ReturnT.SUCCESS;
     }