diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
index 9be92ad4f..b6458985f 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
@@ -63,7 +63,9 @@ public class PermissionController {
         if(Objects.equals(reqVO.getRoleId(), ORGAN_ADMIN_ROLE_ID) || Objects.equals(reqVO.getRoleId(), ORGAN_STAFF_ROLE_ID)) {
         } else {
             // 开启多组织的情况下，需要过滤掉未开通的菜单
-            organService.handleOrganMenu(menuIds -> reqVO.getMenuIds().removeIf(menuId -> !CollUtil.contains(menuIds, menuId)));
+            organService.handleOrganMenu(menuIds -> {
+                reqVO.getMenuIds().removeIf(menuId -> !CollUtil.contains(menuIds, menuId));
+            });
         }
         // 执行菜单的分配
         permissionService.assignRoleMenu(reqVO.getRoleId(), reqVO.getMenuIds());
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 5b1e5570c..a6fd9b09c 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
@@ -338,13 +338,13 @@ public class OrganServiceImpl implements OrganService {
         OrganizationDO tenant = getOrgan(OrganContextHolder.getRequiredOrganId());
         Set<Long> menuIds;
 
-        menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
+        //menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
 
-       /* if (isSystemTenant(tenant)) { // 系统组织，菜单是全量的
+        if (isSystemTenant(tenant)) { // 系统组织，菜单是全量的
             menuIds = CollectionUtils.convertSet(menuService.getMenuList(), MenuDO::getId);
         } else {
             menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
-        }*/
+        }
         // 执行处理器
         handler.handle(menuIds);
     }