From b4effe1ddf79f4442b75df0a092a00ccf6ef2057 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 25 Jun 2024 09:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=8F=9C=E5=8D=95=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=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

---
 .../system/service/permission/PermissionServiceImpl.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 98daa913c..b90ce0250 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
@@ -171,7 +171,8 @@ public class PermissionServiceImpl implements PermissionService {
         if (Objects.isNull(role)) {
             throw new ServiceException(ErrorCodeConstants.ROLE_NOT_EXISTS);
         }
-        if (Objects.isNull(organId)) {
+        // 前端没传或者查一次后切换了组织导致跟角色组织不一致的统一为角色的组织
+        if (Objects.isNull(organId) || ObjectUtil.notEqual(role.getOrganId(), organId)) {
             organId = role.getOrganId();
         }
         final Long finalOrganId = organId;