fix: 标准拆分条款目录-移动层级 优化
This commit is contained in:
+6
-8
@@ -395,15 +395,19 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
|
|||||||
// 更新要移动节点及其子集的排序
|
// 更新要移动节点及其子集的排序
|
||||||
for (int i = 0; i <allList.size(); i++) {
|
for (int i = 0; i <allList.size(); i++) {
|
||||||
SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
|
SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
|
||||||
sarFileSplitMenuEO.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
|
if (!Objects.equals(sarFileSplitMenuEO.getId(), lastMenu.getId())){
|
||||||
|
sarFileSplitMenuEO.setDisplaySeq(lastMenu.getDisplaySeq() + i + 1);
|
||||||
|
}
|
||||||
idlist.add(sarFileSplitMenuEO.getId());
|
idlist.add(sarFileSplitMenuEO.getId());
|
||||||
|
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
|
||||||
}
|
}
|
||||||
Long displaySeq = allList.get(allList.size() - 1).getDisplaySeq();
|
Long displaySeq = allList.get(allList.size() - 1).getDisplaySeq();
|
||||||
|
|
||||||
// 更新 大于 要移动到节点最后节点 的节点排序值
|
// 更新 大于 要移动到节点最后节点 的节点排序值
|
||||||
List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
|
List<SarFileSplitMenuEO> sarFileSplitMenuEOList =
|
||||||
baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq());
|
baseMapper.queryByGTDisplaySeq(sarFileSplitMenuEO1.getInfoId(), lastMenu.getDisplaySeq());
|
||||||
sarFileSplitMenuEOList = sarFileSplitMenuEOList.stream().filter(v -> !idlist.contains(v.getId())).collect(Collectors.toList());
|
sarFileSplitMenuEOList = sarFileSplitMenuEOList.stream()
|
||||||
|
.filter(v -> !idlist.contains(v.getId())).collect(Collectors.toList());
|
||||||
for (int i = 0; i < sarFileSplitMenuEOList.size(); i++) {
|
for (int i = 0; i < sarFileSplitMenuEOList.size(); i++) {
|
||||||
// 更新排序
|
// 更新排序
|
||||||
SarFileSplitMenuEO fileSplitMenuEO = sarFileSplitMenuEOList.get(i);
|
SarFileSplitMenuEO fileSplitMenuEO = sarFileSplitMenuEOList.get(i);
|
||||||
@@ -411,12 +415,6 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
|
|||||||
baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
|
baseMapper.updateByPrimaryKeySelective(fileSplitMenuEO);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 更新要移动节点及其子集的排序
|
|
||||||
for (int i = 0; i <allList.size(); i++) {
|
|
||||||
SarFileSplitMenuEO sarFileSplitMenuEO = allList.get(i);
|
|
||||||
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 更新要移动节点的parentId
|
// 更新要移动节点的parentId
|
||||||
sarFileSplitMenuEO1.setParentId(targetId);
|
sarFileSplitMenuEO1.setParentId(targetId);
|
||||||
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO1);
|
baseMapper.updateByPrimaryKeySelective(sarFileSplitMenuEO1);
|
||||||
|
|||||||
Reference in New Issue
Block a user