diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 8852e0412..f9d64cd37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -48,6 +48,7 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl children = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); int sort = 0; if(StringUtils.isBlank(lawsMonthlyReportTitleTemplateEO.getParentId())){ + //新增父级 if(parent.size() == 0){ lawsMonthlyReportTitleTemplateEO.setSort(0); }else{ @@ -56,10 +57,15 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl childrenList = children.stream() + .filter(e -> lawsMonthlyReportTitleTemplateEO.getParentId().equals(e.getParentId())) + .collect(Collectors.toList()); + + if(childrenList.size() == 0){ lawsMonthlyReportTitleTemplateEO.setSort(0); }else{ - List sortList = parent.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList()); + List sortList = childrenList.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList()); Collections.sort(sortList); sort = sortList.get(sortList.size()-1) + 1; }