|
@ -51,6 +51,16 @@ public class RoleServiceImpl implements RoleService { |
|
|
if (roleVo.getMenuIds() == null || roleVo.getMenuIds().isEmpty()) { |
|
|
if (roleVo.getMenuIds() == null || roleVo.getMenuIds().isEmpty()) { |
|
|
return Result.error("权限为空"); |
|
|
return Result.error("权限为空"); |
|
|
} |
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
if(roleVo.getFatherId() != 2) { |
|
|
|
|
|
for(Integer menuId : roleVo.getMenuIds()){ |
|
|
|
|
|
if(menuId == 9){ |
|
|
|
|
|
return Result.error("上级角色非管理员用户不能赋予权限管理"); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
try { |
|
|
try { |
|
|
roleMapper.addRole(roleVo); |
|
|
roleMapper.addRole(roleVo); |
|
|
Role role = roleMapper.selectByRoleName(roleVo.getRoleName()); |
|
|
Role role = roleMapper.selectByRoleName(roleVo.getRoleName()); |
|
@ -74,6 +84,9 @@ public class RoleServiceImpl implements RoleService { |
|
|
if (roleVo.getId() == null) { |
|
|
if (roleVo.getId() == null) { |
|
|
return Result.error("角色id为空"); |
|
|
return Result.error("角色id为空"); |
|
|
} |
|
|
} |
|
|
|
|
|
if(roleVo.getId() == 2){ |
|
|
|
|
|
return Result.error("管理员不允许删除"); |
|
|
|
|
|
} |
|
|
try { |
|
|
try { |
|
|
roleMapper.deleteRoleMenu(roleVo); |
|
|
roleMapper.deleteRoleMenu(roleVo); |
|
|
roleMapper.deleteRole(roleVo); |
|
|
roleMapper.deleteRole(roleVo); |
|
|