diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java index 1578cf59..1a87847f 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java @@ -40,13 +40,13 @@ public class LawsGradeServiceImpl extends ServiceImpl queryList() { List grades = lawsGradeService.list(); List standardLevels = lawsEnterpriseStandardLevelService.list(); - if (standardLevels == null || standardLevels.size() == 0 || grades == null || grades.size() == 0){ + if (standardLevels == null || standardLevels.isEmpty() || grades == null || grades.isEmpty()){ return new ArrayList<>(); } Map> map = standardLevels.stream().collect(Collectors.groupingBy(LawsEnterpriseStandardLevel::getGradeId)); for (LawsGrade grade : grades) { List levels = map.get(grade.getId()); - if (levels != null && levels.size() > 0){ + if (levels != null && !levels.isEmpty()){ List collect = levels.stream().map(LawsEnterpriseStandardLevel::getDeptId).distinct().collect(Collectors.toList()); List sysDepartList = sysDepartService.listByIds(collect); String departNames = sysDepartList.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); @@ -57,6 +57,7 @@ public class LawsGradeServiceImpl extends ServiceImpl