删除无用代码

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

@@ -40,8 +40,6 @@ import static com.tzld.piaoquan.wecom.common.constant.TimeConstant.MILLISECOND_D
 @Component
 public class WeComMessageDataJob {
 
-    private static final HttpPoolClient httpPoolClientDefault = HttpClientUtil.create(30000, 30000, 2000, 5000, 5, 30000);
-
     @Autowired
     private UserMapper userMapper;
 

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

@@ -33,8 +33,6 @@ import static com.tzld.piaoquan.wecom.common.constant.TimeConstant.MILLISECOND_D
 @Component
 public class WeComMessageDataJob1 {
 
-    private static final HttpPoolClient httpPoolClientDefault = HttpClientUtil.create(30000, 30000, 2000, 5000, 5, 30000);
-
     @Autowired
     private UserMapper userMapper;
 
@@ -184,6 +182,7 @@ public class WeComMessageDataJob1 {
         StaffWithUserExample example = new StaffWithUserExample();
         StaffWithUserExample.Criteria criteria = example.createCriteria();
         criteria.andUserIdEqualTo(user.getId());
+        criteria.andIsDeleteEqualTo(0);
         if (staffId != null) {
             criteria.andUserIdEqualTo(staffId);
         }
@@ -192,7 +191,6 @@ public class WeComMessageDataJob1 {
             return null;
         }
         int n = 0;
-        List<SendMessage> sendMessageList = new ArrayList<>();
         SendMessage sendMessage = new SendMessage();
         for (PushMessage pushMessage : goodHistoryPushList) {
             if (pushMessage.getUserIds().contains(user.getId())) {
@@ -233,6 +231,7 @@ public class WeComMessageDataJob1 {
             log.error("组装数据失败 user={}", user);
             return null;
         }
+        List<SendMessage> sendMessageList = new ArrayList<>();
         for (StaffWithUser staffWithUser : staffWithUserList) {
             SendMessage newSendMessage = new SendMessage();
             BeanUtils.copyProperties(sendMessage, newSendMessage);