gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.2.5】【role】更新角色查询条件

pull/37/head
fengshuonan 2022-09-30 11:42:59 +08:00
parent 1f0fb1e9c7
commit 4677f9bbde
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java
View File

@ -194,6 +194,12 @@ public class SysRoleRequest extends BaseRequest {
@NotNull(message = "全选标识不能为空", groups = {grantAll.class}) @NotNull(message = "全选标识不能为空", groups = {grantAll.class})
private Boolean totalSelectFlag; private Boolean totalSelectFlag;
/**
* 是否是管理员角色，管理员角色只能管理后台相关菜单
*/
@ChineseDescription("是否是管理员角色，管理员角色只能管理后台相关菜单")
private String adminFlag;
/** /**
* 参数校验分组：授权菜单和按钮 * 参数校验分组：授权菜单和按钮
*/ */

6
kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java
View File

@ -201,6 +201,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override @Override
public PageResult<SysRole> findPage(SysRoleRequest sysRoleRequest) { public PageResult<SysRole> findPage(SysRoleRequest sysRoleRequest) {
LambdaQueryWrapper<SysRole> wrapper = createWrapper(sysRoleRequest); LambdaQueryWrapper<SysRole> wrapper = createWrapper(sysRoleRequest);
// 不查询管理员类型的
wrapper.eq(SysRole::getRoleSystemFlag, YesOrNotEnum.N.getCode());
Page<SysRole> sysRolePage = this.page(PageFactory.defaultPage(), wrapper); Page<SysRole> sysRolePage = this.page(PageFactory.defaultPage(), wrapper);
return PageResultFactory.createPageResult(sysRolePage); return PageResultFactory.createPageResult(sysRolePage);
} }
@ -765,6 +769,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
// 根据编码模糊查询 // 根据编码模糊查询
queryWrapper.like(ObjectUtil.isNotEmpty(sysRoleRequest.getRoleCode()), SysRole::getRoleCode, sysRoleRequest.getRoleCode()); queryWrapper.like(ObjectUtil.isNotEmpty(sysRoleRequest.getRoleCode()), SysRole::getRoleCode, sysRoleRequest.getRoleCode());
// 根据是否是管理员类型查询
queryWrapper.eq(ObjectUtil.isNotEmpty(sysRoleRequest.getAdminFlag()), SysRole::getAdminFlag, sysRoleRequest.getAdminFlag());
return queryWrapper; return queryWrapper;
} }