From 280a3392aa0b652e4bdf2ad82533383255ac46df Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 8 Aug 2025 16:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=A8=E4=B8=B0=E7=BB=84=E7=BB=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E6=9D=83=E9=99=90=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/security/core/util/SecurityFrameworkUtils.java    | 2 +-
 .../cf/imes/module/system/service/organ/OrganServiceImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java b/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java
index 7a711ff96..3ea8b1bbf 100644
--- a/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java
+++ b/cf-framework/cf-spring-boot-starter-security/src/main/java/com/cf/imes/framework/security/core/util/SecurityFrameworkUtils.java
@@ -155,7 +155,7 @@ public class SecurityFrameworkUtils {
      */
     public static boolean isManageEndPoint() {
         LoginUser loginUser = getLoginUser();
-        return Objects.equals(loginUser.getUserType(), UserTypeEnum.ADMIN.getValue()) && loginUser.getIsSupAdmin();
+        return Objects.equals(loginUser.getUserType(), UserTypeEnum.ADMIN.getValue());
     }
 
     /**
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
index 52ff786d9..b8de1e42a 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
@@ -509,7 +509,7 @@ public class OrganServiceImpl implements OrganService {
 
         //menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
 
-        if (isSystemTenant(tenant)) { // 系统组织，菜单是全量的
+        if (isSystemTenant(tenant) || (SecurityFrameworkUtils.isCfOrg() && SecurityFrameworkUtils.isManageEndPoint())) { // 系统组织，菜单是全量的
             menuIds = CollectionUtils.convertSet(menuService.getMenuList(), MenuDO::getId);
         } else {
             menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();