Merge branch 'dev-xym-update' of Server/growth-manager into master

common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComUserServiceImpl.java

@@ -316,7 +316,7 @@ public class WeComUserServiceImpl implements WeComUserService {
     @Override
     public List<Staff> getStaffByUserId(Long userId) {
         StaffWithUserExample example = new StaffWithUserExample();
-        example.createCriteria().andUserIdEqualTo(userId);
+        example.createCriteria().andUserIdEqualTo(userId).andIsDeleteEqualTo(0);
         List<StaffWithUser> staffWithUsers = staffWithUserMapper.selectByExample(example);
         if (CollectionUtils.isEmpty(staffWithUsers)) {
             return null;

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

@@ -90,12 +90,18 @@ public class WeComHistoryDataJob {
     @XxlJob("saveHistoryMessageJob1")
     public ReturnT<String> saveHistoryMessageJob1(String param) {
         Integer startTimeVal = (Integer) redisTemplate.opsForValue().get(START_TIME_KEY);
+        Long dayStartTime = DateUtil.getBeforeDayStart(0);
         Long startTime;
         if (startTimeVal == null) {
             startTime = DateUtil.getBeforeDayStart(0);
         } else {
-            startTime = (long) startTimeVal;
+            if (dayStartTime > startTimeVal) {
+                startTime = dayStartTime;
+            } else {
+                startTime = (long) startTimeVal;
+            }
         }
+
         Long endTime = System.currentTimeMillis() / 1000;
         CorpExample example = new CorpExample();
         List<Corp> corps = corpMapper.selectByExample(example);