From 787fa17f61b6121e49d6dc5755f53d326944e09d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 22 Sep 2022 18:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=A0=87=E9=A2=98=E4=B8=8A?=
 =?UTF-8?q?=E7=A7=BB=E4=B8=8B=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsMonthlyReportTitleTemplateEOServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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<Law
 		List<LawsMonthlyReportTitleTemplateEO> 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<Law
 				sort = sortList.get(sortList.size()-1) + 1;
 			}
 		}else{
-			if(children.size() == 0){
+			//判断该父级下是否有子级
+			List<LawsMonthlyReportTitleTemplateEO> childrenList = children.stream()
+					.filter(e -> lawsMonthlyReportTitleTemplateEO.getParentId().equals(e.getParentId()))
+					.collect(Collectors.toList());
+
+			if(childrenList.size() == 0){
 				lawsMonthlyReportTitleTemplateEO.setSort(0);
 			}else{
-				List<Integer> sortList = parent.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList());
+				List<Integer> sortList = childrenList.stream().map(LawsMonthlyReportTitleTemplateEO::getSort).collect(Collectors.toList());
 				Collections.sort(sortList);
 				sort = sortList.get(sortList.size()-1) + 1;
 			}