From 079dc12fe13d4b24d9b652f22f335e4f6b7b0465 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 31 五月 2021 16:55:26 +0800 Subject: [PATCH] update 优化 system 模块 删除性能 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 98616e8..65f8601 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -48,15 +48,7 @@ @Override @DataScope(deptAlias = "d") public List<SysDept> selectDeptList(SysDept dept) { - Object dataScope = dept.getParams().get("dataScope"); - return list(new LambdaQueryWrapper<SysDept>() - .eq(dept.getParentId() != null && dept.getParentId() != 0, - SysDept::getParentId, dept.getParentId()) - .like(StrUtil.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName()) - .eq(StrUtil.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus()) - .apply(dataScope != null, dataScope != null ? dataScope.toString() : null) - .orderByAsc(SysDept::getParentId) - .orderByAsc(SysDept::getOrderNum)); + return baseMapper.selectDeptList(dept); } /** @@ -249,7 +241,7 @@ List<SysDept> children = list(new LambdaQueryWrapper<SysDept>() .apply("find_in_set({0},ancestors)",deptId)); for (SysDept child : children) { - child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors)); + child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); } if (children.size() > 0) { updateBatchById(children); -- Gitblit v1.9.3