valhalla / fw-valhalla

Commit c375a6d5004e4666100a92cdfb1ffadc0e58dcb4

Authored by 张志伟
2 parents 3525dd80 6d271e06

Merge remote-tracking branch 'origin/dev' into test 

# Conflicts:
#	fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/RoleChangeTask.java
Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/CallReportDealTask.java
  View file @c375a6d
@@ -99,7 +99,9 @@ public class CallReportDealTask { @@ -99,7 +99,9 @@ public class CallReportDealTask {
99 log.error("处理通话记录失败", e); 99 log.error("处理通话记录失败", e);
100 } 100 }
101 } 101 }
102 - redisTemplate.opsForList().rightPushAll(getCallReportKey(), failList); 102 + if (!CollectionUtils.isEmpty(failList)) {
  103 + redisTemplate.opsForList().rightPushAll(getCallReportKey(), failList);
  104 + }
103 } 105 }
104 106
105 @Nullable 107 @Nullable
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/RoleChangeTask.java
  View file @c375a6d
@@ -12,6 +12,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -12,6 +12,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
12 import org.springframework.data.redis.core.StringRedisTemplate; 12 import org.springframework.data.redis.core.StringRedisTemplate;
13 import org.springframework.scheduling.annotation.Scheduled; 13 import org.springframework.scheduling.annotation.Scheduled;
14 import org.springframework.stereotype.Component; 14 import org.springframework.stereotype.Component;
  15 +import org.springframework.util.CollectionUtils;
15 16
16 import java.util.ArrayList; 17 import java.util.ArrayList;
17 import java.util.List; 18 import java.util.List;
@@ -63,6 +64,8 @@ public class RoleChangeTask { @@ -63,6 +64,8 @@ public class RoleChangeTask {
63 log.error("处理员工角色变动失败", e); 64 log.error("处理员工角色变动失败", e);
64 } 65 }
65 } 66 }
66 - redisTemplate.opsForList().rightPushAll(getRoleChangeKey(), failList); 67 + if (!CollectionUtils.isEmpty(failList)) {
  68 + redisTemplate.opsForList().rightPushAll(getRoleChangeKey(), failList);
  69 + }
67 } 70 }
68 } 71 }