|
|
@@ -83,7 +83,7 @@ public class RoleService extends BaseService<Role> {
|
|
|
}
|
|
|
|
|
|
private void setRoleItem(RoleVo roleVO, Role role) {
|
|
|
- if(roleVO.getRoleFunList() != null && roleVO.getRoleFunList().size() > 0){
|
|
|
+ if (roleVO.getRoleFunList() != null && roleVO.getRoleFunList().size() > 0) {
|
|
|
//新建角色功能权限
|
|
|
for (RoleFun roleFun : roleVO.getRoleFunList()) {
|
|
|
roleFun.setRoleId(role.getRoleId());
|
|
|
@@ -91,7 +91,7 @@ public class RoleService extends BaseService<Role> {
|
|
|
}
|
|
|
roleFunService.saveRoleFun(roleVO.getRoleFunList());
|
|
|
}
|
|
|
- if(roleVO.getRoleSensitiveList() != null && roleVO.getRoleSensitiveList().size() > 0){
|
|
|
+ if (roleVO.getRoleSensitiveList() != null && roleVO.getRoleSensitiveList().size() > 0) {
|
|
|
//新建角色敏感信息权限
|
|
|
for (RoleSensitive roleSensitive : roleVO.getRoleSensitiveList()) {
|
|
|
roleSensitive.setRoleId(role.getRoleId());
|
|
|
@@ -111,12 +111,12 @@ public class RoleService extends BaseService<Role> {
|
|
|
)
|
|
|
public ResponseResultVO<?> updateRole(RoleVo roleVO) {
|
|
|
Role role = roleConvert.convertToPo(roleVO);
|
|
|
- roleMapper.updateById(role);
|
|
|
- if(roleVO.getRoleFunList() != null){
|
|
|
+ updateByUuid(role);
|
|
|
+ if (roleVO.getRoleFunList() != null) {
|
|
|
//删除历史功能权限
|
|
|
roleFunService.deleteRoleId(roleVO.getRoleId());
|
|
|
}
|
|
|
- if(roleVO.getRoleSensitiveList() != null){
|
|
|
+ if (roleVO.getRoleSensitiveList() != null) {
|
|
|
//删除历史敏感信息权限
|
|
|
roleSensitiveService.deleteRoleId(roleVO.getRoleId());
|
|
|
}
|
|
|
@@ -125,6 +125,7 @@ public class RoleService extends BaseService<Role> {
|
|
|
setRoleItem(roleVO, role);
|
|
|
return ResponseResultUtil.success();
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* @desc : 启用停用
|
|
|
* @author : 于继渤
|