Merge branch 'dev-xym-log' of Server/we-com-manage into master

we-com-server/src/main/java/com/tzld/piaoquan/wecom/job/WeComMessageDataJob.java

@@ -126,7 +126,10 @@ public class WeComMessageDataJob {
     @XxlJob("assembleSendMessageJob")
     public ReturnT<String> assembleSendMessage(String param) {
         init();
-        Map<String, List<String>> res = new HashMap<>();
+        Long staffId = null;
+        if (StringUtils.isNotEmpty(param)) {
+            staffId = Long.parseLong(param);
+        }
         UserExample example = new UserExample();
         long count = userMapper.countByExample(example);
         int page = 1;
@@ -141,7 +144,7 @@ public class WeComMessageDataJob {
             //落库逻辑
             List<SendMessage> allSeneMessageList = new ArrayList<>();
             for (User user : userList) {
-                List<SendMessage> sendMessageList = getSendMessage(user);
+                List<SendMessage> sendMessageList = getSendMessage(user, staffId);
                 if (!CollectionUtils.isEmpty(sendMessageList)) {
                     allSeneMessageList.addAll(sendMessageList);
                 }
@@ -172,7 +175,17 @@ public class WeComMessageDataJob {
         }
     }
 
-    public List<SendMessage> getSendMessage(User user) {
+    public List<SendMessage> getSendMessage(User user, Long staffId) {
+        StaffWithUserExample example = new StaffWithUserExample();
+        StaffWithUserExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(user.getId());
+        if (staffId != null) {
+            criteria.andUserIdEqualTo(staffId);
+        }
+        List<StaffWithUser> staffWithUserList = staffWithUserMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(staffWithUserList)) {
+            return null;
+        }
         int n = 0;
         List<SendMessage> sendMessageList = new ArrayList<>();
         SendMessage sendMessage = new SendMessage();
@@ -215,12 +228,6 @@ public class WeComMessageDataJob {
             log.error("组装数据失败 user={}", user);
             return null;
         }
-        StaffWithUserExample example = new StaffWithUserExample();
-        example.createCriteria().andUserIdEqualTo(user.getId());
-        List<StaffWithUser> staffWithUserList = staffWithUserMapper.selectByExample(example);
-        if (CollectionUtils.isEmpty(staffWithUserList)) {
-            return null;
-        }
         for (StaffWithUser staffWithUser : staffWithUserList) {
             SendMessage newSendMessage = new SendMessage();
             BeanUtils.copyProperties(sendMessage, newSendMessage);