|
@@ -234,10 +234,9 @@ public class CacheContext implements CommandLineRunner {
|
|
|
ruleList.clear();
|
|
|
ruleMap.clear();
|
|
|
ruleList = organizationEvaluationRuleService.list();
|
|
|
-
|
|
|
- ruleList = ruleList.stream().filter(t -> !t.getDelFlag() && t.getIsCheck()).collect(Collectors.toList());
|
|
|
- ruleMap = ruleList.stream().collect(Collectors.groupingBy(OrganizationEvaluationRule::getOrganizationId));
|
|
|
+ if (ruleList != null) {
|
|
|
+ ruleList = ruleList.stream().filter(t -> t != null && !t.getDelFlag() && t.getIsCheck()).collect(Collectors.toList());
|
|
|
+ ruleMap = ruleList.stream().collect(Collectors.groupingBy(OrganizationEvaluationRule::getOrganizationId));
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|