diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 7606c490..6546c929 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -2269,6 +2269,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sourceIdList = Arrays.asList(sourceIds.split(",")); // 获取要移动到的层级的最后一个 的排序值 List lastMenuList = getLastMenu(parentMenu.getId(),displaySeq,sourceIdList); - - if(displaySeq == 0){ - displaySeq = parentMenu.getDisplaySeq(); + if (CollectionUtil.isNotEmpty(lastMenuList)){ + displaySeq = lastMenuList.stream().map(SarFileSplitMenuEO::getDisplaySeq).min(Comparator.comparing(x -> x)).orElse(null); } // 要移动的节点所有子集(包括本身) List sarFileSplitMenuEO1List = new ArrayList<>(); - List idList = new ArrayList<>(); - for (int i = 0; i < sourceIdList.size(); i++) { - String sourceId = sourceIdList.get(i); + for (String sourceId : sourceIdList) { // 要移动的节点信息 SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId); sarFileSplitMenuEO.setParentId(parentId); sarFileSplitMenuEO1List.add(sarFileSplitMenuEO); - idList.add(sourceId); } List allList = new ArrayList<>(); getChildren(allList, sarFileSplitMenuEO1List); + //for (SarFileSplitMenuEO splitMenuEO : allList) { + // splitMenuEO.setParentId(parentId); + //} //排除 getChildren(allList, lastMenuList);