admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 修复 查询部门下拉树未过滤数据权限问题

Browse Source
This commit is contained in:
疯狂的狮子Li 2023-06-30 14:28:10 +08:00
parent 55c8ea7082
commit a7586639ab
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java
View File

@ -1,7 +1,6 @@
package org.dromara.system.service; package org.dromara.system.service;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import org.dromara.system.domain.SysDept;
import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysDeptBo;
import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.domain.vo.SysDeptVo;
@ -35,7 +34,7 @@ public interface ISysDeptService {
* @param depts 部门列表 * @param depts 部门列表
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts); List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts);
/** /**
* 根据角色ID查询部门树信息 * 根据角色ID查询部门树信息

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
View File

@ -70,7 +70,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
@Override @Override
public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) { public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
List<SysDept> depts = baseMapper.selectList(lqw); List<SysDeptVo> depts = baseMapper.selectDeptList(lqw);
return buildDeptTreeSelect(depts); return buildDeptTreeSelect(depts);
} }
@ -93,7 +93,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
* @return 下拉树结构列表 * @return 下拉树结构列表
*/ */
@Override @Override
public List<Tree<Long>> buildDeptTreeSelect(List<SysDept> depts) { public List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts) {
if (CollUtil.isEmpty(depts)) { if (CollUtil.isEmpty(depts)) {
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }