Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

Browse Source
This commit is contained in:
lym
2024-04-19 17:35:12 +08:00
parent 4cac05a412 5c8075404e
commit 7b1306342f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/PermissionController.java
+3 -1
View File
@@ -63,7 +63,9 @@ public class PermissionController {
if(Objects.equals(reqVO.getRoleId(), ORGAN_ADMIN_ROLE_ID) || Objects.equals(reqVO.getRoleId(), ORGAN_STAFF_ROLE_ID)) { if(Objects.equals(reqVO.getRoleId(), ORGAN_ADMIN_ROLE_ID) || Objects.equals(reqVO.getRoleId(), ORGAN_STAFF_ROLE_ID)) {
} else { } 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()); permissionService.assignRoleMenu(reqVO.getRoleId(), reqVO.getMenuIds());
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+3 -3
View File
@@ -338,13 +338,13 @@ public class OrganServiceImpl implements OrganService {
OrganizationDO tenant = getOrgan(OrganContextHolder.getRequiredOrganId()); OrganizationDO tenant = getOrgan(OrganContextHolder.getRequiredOrganId());
Set<Long> menuIds; 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); menuIds = CollectionUtils.convertSet(menuService.getMenuList(), MenuDO::getId);
} else { } else {
menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds(); menuIds = tenantPackageService.getTenantPackage(tenant.getPackageId()).getMenuIds();
}*/ }
// 执行处理器 // 执行处理器
handler.handle(menuIds); handler.handle(menuIds);
} }