Commit 2384fc1f by huangjinxin

fix:角色删除优化

1 parent 838f48f6
......@@ -134,7 +134,7 @@ public enum StatusCodeEnum {
FENDAN_IS_TRANSCEND("024", "分单超派", false),
RESOURCE_USER_EXISTS_ROLE("025", "用绑定用户的角色不允许删除,需要解绑后才可以删除角色", false),
RESOURCE_USER_EXISTS_ROLE("025", "角色已绑定用户,请解绑用户后再删除角色!", false),
ORDER_EXISTS("026", "订单已存在", false);
......
......@@ -58,8 +58,7 @@ public class RoleController implements IRole {
if (StringUtils.isBlank(roleInfo.getId())) {
return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, false);
}
roleService.deleteRole(roleInfo.getId());
return Result.success(true);
return roleService.deleteRole(roleInfo.getId());
}
@Override
......
......@@ -125,15 +125,15 @@ public class RoleService {
}
@Transactional(rollbackFor = Exception.class)
public void deleteRole(String roleId) {
public Result deleteRole(String roleId) {
// 查询角色是否存在
RoleEntity roleEntity = roleDao.findById(roleId).orElse(null);
if (ObjectUtil.isNull(roleEntity)) {
throw new BusinessException(StatusCodeEnum.ROLE_DOES_NOT_EXIST);
return Result.failed(StatusCodeEnum.ROLE_DOES_NOT_EXIST);
}
List<UserRoleEntity> roleEntities = userRoleDao.findByRoleId(roleId);
if (CollectionUtils.isNotEmpty(roleEntities)) {
throw new BusinessException(StatusCodeEnum.RESOURCE_USER_EXISTS_ROLE);
return Result.failed(StatusCodeEnum.RESOURCE_USER_EXISTS_ROLE);
}
// 删除角色
roleDao.deleteById(roleId);
......@@ -141,6 +141,7 @@ public class RoleService {
userRoleDao.deleteByRoleId(roleId);
// 删除权限和角色的关系
roleResourceDao.deleteByRoleId(roleId);
return Result.success();
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!