diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index c188d838..375320a9 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -68,11 +68,12 @@ public class SarFileSplitMenuEOController extends JeroController updateMenuLevel(String id, String parentId) { - sarFileSplitMenuEOService.updateMenuLevel(id, parentId); + public Result updateMenuLevel(@ApiParam(value = "要移动的节点id")String sourceId, + @ApiParam(value = "要移动到的节点id")String targetId) { + sarFileSplitMenuEOService.updateMenuLevel(sourceId, targetId); return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java index 25abf27c..5d6af30b 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java @@ -58,5 +58,5 @@ public interface ISarFileSplitMenuEOService extends IService Result moveUpOrDown(JSONObject json); - void updateMenuLevel(String id, String parentId); + void updateMenuLevel(String sourceId, String targetId); } 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 59058a13..7c7f223a 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 @@ -374,40 +374,43 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl sarFileSplitMenuEO1List = new ArrayList<>(); sarFileSplitMenuEO1List.add(sarFileSplitMenuEO1); List allList = new ArrayList<>(); getChildren(allList, sarFileSplitMenuEO1List); - // 获取要移动节点的数量 - int childCount = allList.size(); + // 要移动节点的数量 + int moveNodeCount = allList.size(); - // 更新下节点排序 - SarFileSplitMenuEO parentSarFileSplitMenu = baseMapper.findById(parentId); + // 更新 大于 要移动到节点最后节点 的节点排序值 List sarFileSplitMenuEOList = - baseMapper.queryByGTDisplaySeq(parentSarFileSplitMenu.getInfoId(), lastMenu.getDisplaySeq()); + baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq()); for (SarFileSplitMenuEO fileSplitMenuEO : sarFileSplitMenuEOList) { // 更新排序 - fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() + childCount); + fileSplitMenuEO.setDisplaySeq(fileSplitMenuEO.getDisplaySeq() + moveNodeCount); baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO); } - // 更新要移动节点的排序 + // 更新要移动节点及其子集的排序 for (int i = 0; i