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

【8.1.0】【role】更新角色删除接口

pull/60/head
fengshuonan 2024-01-16 17:06:28 +08:00
parent 43470122c2
commit 34500bbc6d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/enums/exception/SysRoleExceptionEnum.java
View File

@ -29,9 +29,9 @@ public enum SysRoleExceptionEnum implements AbstractExceptionEnum {
SYSTEM_ROLE_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10003", "系统角色不能被删除"), SYSTEM_ROLE_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10003", "系统角色不能被删除"),
/** /**
* 非管理员用户，不能删除其他角色 * 非管理员，只能删除自己公司的角色
*/ */
DEL_PERMISSION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10004", "非管理员用户，不能删除其他角色"); DEL_PERMISSION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + "10004", "非管理员，只能删除自己公司的角色");
/** /**
* 错误编码 * 错误编码

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

@ -82,9 +82,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
throw new ServiceException(SysRoleExceptionEnum.SYSTEM_ROLE_CANT_DELETE); throw new ServiceException(SysRoleExceptionEnum.SYSTEM_ROLE_CANT_DELETE);
} }
// 非管理员，只能删除自己的角色 // 非管理员，只能删除自己公司的角色
if (!LoginContext.me().getSuperAdminFlag()) { if (!LoginContext.me().getSuperAdminFlag()) {
if (!sysRole.getCreateUser().equals(LoginContext.me().getLoginUser().getUserId())) { Long currentUserCompanyId = LoginContext.me().getCurrentUserCompanyId();
if (currentUserCompanyId == null || !currentUserCompanyId.equals(sysRole.getRoleCompanyId())) {
throw new ServiceException(SysRoleExceptionEnum.DEL_PERMISSION_ERROR); throw new ServiceException(SysRoleExceptionEnum.DEL_PERMISSION_ERROR);
} }
} }
@ -110,11 +111,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
throw new ServiceException(SysRoleExceptionEnum.SYSTEM_ROLE_CANT_DELETE); throw new ServiceException(SysRoleExceptionEnum.SYSTEM_ROLE_CANT_DELETE);
} }
// 如果当前用户是非管理员，则只能删除自己创建的角色 // 如果当前用户是非管理员，则只能删除自己公司的角色
if (!LoginContext.me().getSuperAdminFlag()) { if (!LoginContext.me().getSuperAdminFlag()) {
LambdaQueryWrapper<SysRole> tempWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysRole> tempWrapper = new LambdaQueryWrapper<>();
tempWrapper.in(SysRole::getRoleId, sysRoleRequest.getRoleIdList()); tempWrapper.in(SysRole::getRoleId, sysRoleRequest.getRoleIdList());
tempWrapper.ne(BaseEntity::getCreateUser, LoginContext.me().getLoginUser().getUserId()); tempWrapper.ne(SysRole::getRoleCompanyId, LoginContext.me().getCurrentUserCompanyId());
long notMeCreateCount = this.count(tempWrapper); long notMeCreateCount = this.count(tempWrapper);
if (notMeCreateCount > 0) { if (notMeCreateCount > 0) {
throw new ServiceException(SysRoleExceptionEnum.DEL_PERMISSION_ERROR); throw new ServiceException(SysRoleExceptionEnum.DEL_PERMISSION_ERROR);
@ -158,8 +159,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
LambdaQueryWrapper<SysRole> wrapper = createWrapper(sysRoleRequest); LambdaQueryWrapper<SysRole> wrapper = createWrapper(sysRoleRequest);
// 只查询需要的字段 // 只查询需要的字段
wrapper.select(SysRole::getRoleName, SysRole::getRoleCode, SysRole::getRoleSort, SysRole::getRoleId, BaseEntity::getCreateTime, SysRole::getRoleType, wrapper.select(SysRole::getRoleName, SysRole::getRoleCode, SysRole::getRoleSort, SysRole::getRoleId, BaseEntity::getCreateTime, SysRole::getRoleType, SysRole::getRoleCompanyId);
SysRole::getRoleCompanyId);
// 非管理员用户只能查看自己创建的角色 // 非管理员用户只能查看自己创建的角色
this.filterRolePermission(wrapper); this.filterRolePermission(wrapper);