diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
index 8d447559..85827283 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitMenuEOMapper.xml
@@ -375,8 +375,11 @@
select * from SAR_FILE_SPLIT_MENU
where parent_id = #{parentId}
AND valid_flag = '0'
- and display_seq > #{displaySeq}
- order by display_seq desc
+
+ and display_seq > #{displaySeq}
+
+
+ order by display_seq
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index 29212896..b7955d48 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -377,30 +377,55 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
+ Long menuDisplaySeq = parentMenu.getDisplaySeq();
List sourceIdList = Arrays.asList(sourceIds.split(","));
- int size = sourceIdList.size();
- for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
- Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
- sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
- baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
- }
- if(displaySeq == 0){
- displaySeq = parentMenu.getDisplaySeq();
- }
- //this.updateBatchById(lastMenuList);
- List updateList = new ArrayList<>();
- for (int i = 0; i < sourceIdList.size(); i++) {
- String sourceId = sourceIdList.get(i);
- // 要移动的节点信息
- SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
- sarFileSplitMenuEO.setParentId(parentId);
- sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
- updateList.add(sarFileSplitMenuEO);
- baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+
+ List lastMenuList;
+ //是否是放到最后
+ boolean equals = Objects.equals(menuDisplaySeq, displaySeq);
+ if (equals){
+ // 获取要移动到的层级的最后一个 的排序值
+ lastMenuList = getLastMenu(parentMenu.getId(),null);
+ int size = lastMenuList.size();
+ for (int i = 0; i < size; i++) {
+ SarFileSplitMenuEO sarFileSplitMenuEO = lastMenuList.get(i);
+ sarFileSplitMenuEO.setDisplaySeq(menuDisplaySeq+i+1);
+ baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+ }
+ if(displaySeq == 0){
+ displaySeq = menuDisplaySeq;
+ }
+ for (int i = 0; i < sourceIdList.size(); i++) {
+ String sourceId = sourceIdList.get(i);
+ // 要移动的节点信息
+ SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
+ sarFileSplitMenuEO.setParentId(parentId);
+ sarFileSplitMenuEO.setDisplaySeq(displaySeq+size+i+1);
+ baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+ }
+ }else {
+ // 获取要移动到的层级的最后一个 的排序值
+ lastMenuList = getLastMenu(parentMenu.getId(),displaySeq);
+ int size = sourceIdList.size();
+ for (SarFileSplitMenuEO sarFileSplitMenuEO : lastMenuList) {
+ Long displaySeq1 = sarFileSplitMenuEO.getDisplaySeq();
+ sarFileSplitMenuEO.setDisplaySeq(displaySeq1+size);
+ baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+ }
+ if(displaySeq == 0){
+ displaySeq = parentMenu.getDisplaySeq();
+ }
+ for (int i = 0; i < sourceIdList.size(); i++) {
+ String sourceId = sourceIdList.get(i);
+ // 要移动的节点信息
+ SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
+ sarFileSplitMenuEO.setParentId(parentId);
+ sarFileSplitMenuEO.setDisplaySeq(displaySeq+i+1);
+ baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
+ }
}
+
+
//this.updateBatchById(updateList);
// 要移动的节点所有子集(包括本身)
//List sarFileSplitMenuEO1List = new ArrayList<>();