From 79ce4c9f2b4740af4f33c174cea9fad626e3171a Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 27 May 2022 10:32:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E6=A0=87=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/xml/SysCategoryMapper.xml   |  2 +-
 .../service/impl/SysCategoryServiceImpl.java  | 36 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
index e14cd1bf6..3264cec41 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
@@ -18,7 +18,7 @@
 	</select>
 
 	<select id="queryPageList" resultType="com.jero.modules.system.entity.SysCategory">
-		select create_by,create_time,sys_org_code,update_by,update_time,attribute_type,code,
+		select create_by,create_time,sys_org_code,update_by,update_time,attribute_type,code,sort_order,
 		del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id
 		from sys_category
 		where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} and del_flag=0
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
index f66abd579..ed2fd62a5 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -319,6 +319,11 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 			queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
 					.eq("del_flag", CommonConstant.DEL_FLAG_0)
 					.orderByAsc("sort_order");
+			if(StringUtils.isNotBlank(sysCategory.getPid())){
+				queryWrapper.eq("pid",sysCategory.getPid());
+			}else{
+				queryWrapper.eq("pid",0);
+			}
 			queryWrapper.eq("sort_order", inputOrderNum);
 			Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper);
 			if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1
@@ -328,17 +333,26 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 						.eq("sys_dict_id",sysCategory.getSysDictId())
 						.eq("del_flag", CommonConstant.DEL_FLAG_0)
 						.orderByAsc("sort_order");
+				if(StringUtils.isNotBlank(sysCategory.getPid())){
+					orderNumQueryWrapper.eq("pid",sysCategory.getPid());
+				}else{
+					orderNumQueryWrapper.eq("pid",0);
+				}
 				List<SysCategory> geOrderNumList = list(orderNumQueryWrapper);
 
 				//判断相邻的序号,去掉不邻的
 				for (int i = 0; i < geOrderNumList.size(); i++) {
-					if (geOrderNumList.size() == 1) {
+					if (geOrderNumList.size() == 1 || (geOrderNumList.size()==2 && geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() == 1)) {
 						break;
 					} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
 						int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
 						geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
-						break;
-					}
+						if(geOrderNumList.size()!=(i+1)) {
+							break;
+						}
+					}/*else if(geOrderNumList.size()==2 && geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() == 1){
+
+					}*/
 				}
 
 				geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
@@ -356,6 +370,11 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 			queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
 					.eq("del_flag", CommonConstant.DEL_FLAG_0)
 					.orderByAsc("sort_order");
+			if(StringUtils.isNotBlank(sysCategory.getPid())){
+				queryWrapper.eq("pid",sysCategory.getPid());
+			}else{
+				queryWrapper.eq("pid",0);
+			}
 			Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId()))
 					.map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
 			queryWrapper.eq("sort_order", inputOrderNum);
@@ -367,16 +386,23 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 						.eq("sys_dict_id",sysCategory.getSysDictId())
 						.eq("del_flag", CommonConstant.DEL_FLAG_0)
 						.orderByAsc("sort_order");
+				if(StringUtils.isNotBlank(sysCategory.getPid())){
+					orderNumQueryWrapper.eq("pid",sysCategory.getPid());
+				}else{
+					orderNumQueryWrapper.eq("pid",0);
+				}
 				List<SysCategory> geOrderNumList = list(orderNumQueryWrapper);
 
 				//判断相邻的序号,去掉不邻的
 				for (int i = 0; i < geOrderNumList.size(); i++) {
-					if (geOrderNumList.size() == 1) {
+					/*if (geOrderNumList.size() == 1) {
 						break;
-					} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
+					} else */if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
 						int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
 						geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
 						break;
+					}else{
+						break;
 					}
 				}