From 99b42111c5c64547a6468763cf71c709e7bee3f0 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 26 Jun 2024 10:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E9=85=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A2=9E=E5=8A=A0organid=E5=92=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=9A=84organid=E7=BB=9F=E4=B8=80=E7=9A=84=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=BA=E7=A9=BA=E6=88=96=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E9=83=BD=E7=BB=9F=E4=B8=80=E4=B8=BA=E8=A7=92=E8=89=B2=E7=9A=84?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/PermissionServiceImpl.java     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
index b90ce0250..a4a7ce9e2 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/PermissionServiceImpl.java
@@ -172,8 +172,9 @@ public class PermissionServiceImpl implements PermissionService {
             throw new ServiceException(ErrorCodeConstants.ROLE_NOT_EXISTS);
         }
         // 前端没传或者查一次后切换了组织导致跟角色组织不一致的统一为角色的组织
-        if (Objects.isNull(organId) || ObjectUtil.notEqual(role.getOrganId(), organId)) {
-            organId = role.getOrganId();
+        Long roleOrganId = role.getOrganId();
+        if (Objects.isNull(organId) || ObjectUtil.notEqual(roleOrganId, organId)) {
+            organId = roleOrganId;
         }
         final Long finalOrganId = organId;
 
@@ -304,6 +305,8 @@ public class PermissionServiceImpl implements PermissionService {
         Set<Long> userIds = reqVO.getUserIds();
         // 组织id
         Long organId = reqVO.getOrganId();
+        // 角色id
+        Long roleId = reqVO.getRoleId();
         // 超管不传组织id则操作本机构角色
         // 非超管不传组织id不允许操作
         if (isSupAdmin) {
@@ -313,8 +316,18 @@ public class PermissionServiceImpl implements PermissionService {
                 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;
-        Long roleId = reqVO.getRoleId();
+
         // 当前用户不能操作含有自己的角色
         if (CollectionUtil.isNotEmpty(userIds)) {
             Long incloudSelf = userIds.stream().filter(userId -> userId.equals(loginUser.getId())).findAny().orElse(null);