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();