jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 修复数据权限问题

Browse Source
This commit is contained in:
疯狂的狮子li
2021-05-08 23:35:39 +08:00
parent 0b6952d0fe
commit a181c09786
7 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -48,15 +48,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
@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);
}
/**

15
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -49,20 +49,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override
@DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role) {
Map<String, Object> params = role.getParams();
Object dataScope = params.get("dataScope");
return list(new LambdaQueryWrapper<SysRole>()
.like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
.eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
.like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"))
.apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
.orderByAsc(SysRole::getRoleSort));
return baseMapper.selectRoleList(role);
}
/**