Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

角色分配用户增加organid和角色的organid统一的处理：为空或不一致都统一为角色的机构；

Browse Source
This commit is contained in:
gaoqr
2024-06-26 10:56:54 +08:00
parent 5b9ead86d1
commit 99b42111c5
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
+16 -3
View File
@@ -172,8 +172,9 @@ public class PermissionServiceImpl implements PermissionService {
throw new ServiceException(ErrorCodeConstants.ROLE_NOT_EXISTS); throw new ServiceException(ErrorCodeConstants.ROLE_NOT_EXISTS);
} }
// 前端没传或者查一次后切换了组织导致跟角色组织不一致的统一为角色的组织 // 前端没传或者查一次后切换了组织导致跟角色组织不一致的统一为角色的组织
if (Objects.isNull(organId) || ObjectUtil.notEqual(role.getOrganId(), organId)) { Long roleOrganId = role.getOrganId();
organId = role.getOrganId(); if (Objects.isNull(organId) || ObjectUtil.notEqual(roleOrganId, organId)) {
organId = roleOrganId;
} }
final Long finalOrganId = organId; final Long finalOrganId = organId;
@@ -304,6 +305,8 @@ public class PermissionServiceImpl implements PermissionService {
Set<Long> userIds = reqVO.getUserIds(); Set<Long> userIds = reqVO.getUserIds();
// 组织id // 组织id
Long organId = reqVO.getOrganId(); Long organId = reqVO.getOrganId();
// 角色id
Long roleId = reqVO.getRoleId();
// 超管不传组织id则操作本机构角色 // 超管不传组织id则操作本机构角色
// 非超管不传组织id不允许操作 // 非超管不传组织id不允许操作
if (isSupAdmin) { if (isSupAdmin) {
@@ -313,8 +316,18 @@ public class PermissionServiceImpl implements PermissionService {
throw new ServiceException(ErrorCodeConstants.ROLE_NOT_SUPERADMIN_NO_ORGAN_ID_OPER_ERROR); throw new ServiceException(ErrorCodeConstants.ROLE_NOT_SUPERADMIN_NO_ORGAN_ID_OPER_ERROR);
} }
} }
// 查询角色获取角色的组织id，如果没有传入组织id就跟角色的组织统一
RoleDO role = roleService.getRole(roleId);
if (Objects.isNull(role)) {
throw new ServiceException(ErrorCodeConstants.ROLE_NOT_EXISTS);
}
// 前端没传或者查一次后切换了组织导致跟角色组织不一致的统一为角色的组织
Long roleOrganId = role.getOrganId();
if (Objects.isNull(organId) || ObjectUtil.notEqual(roleOrganId, organId)) {
organId = roleOrganId;
}
final Long finalOrganId = organId; final Long finalOrganId = organId;
Long roleId = reqVO.getRoleId();
// 当前用户不能操作含有自己的角色 // 当前用户不能操作含有自己的角色
if (CollectionUtil.isNotEmpty(userIds)) { if (CollectionUtil.isNotEmpty(userIds)) {
Long incloudSelf = userIds.stream().filter(userId -> userId.equals(loginUser.getId())).findAny().orElse(null); Long incloudSelf = userIds.stream().filter(userId -> userId.equals(loginUser.getId())).findAny().orElse(null);