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