From d472dbbd193f37869ba2b5ad2a4e7f986ad382b5 Mon Sep 17 00:00:00 2001
From: DaxPay Dev <dev@daxpay.com>
Date: Sat, 25 Jul 2026 11:35:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(iam):=20=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=88=86=E9=85=8D=E8=B7=A8=E7=BB=88=E7=AB=AF=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=80=81=E8=BF=87=E6=BB=A4,=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=B2=E9=80=89=E6=95=B0=E5=A4=A7=E4=BA=8E=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

角色菜单/权限码分配跨终端共用一张关系表, 加载勾选态时未按当前终端过滤,
导致其他终端的分配被计入, 前端出现"已选数 > 总数"(如 34/33).
改为以当前终端菜单树与对应权限码集合为白名单过滤勾选态.
---
 .../assign/RoleUnifiedAssignService.java      | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/permission/assign/RoleUnifiedAssignService.java b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/permission/assign/RoleUnifiedAssignService.java
index 574ef72d8..7652bfce8 100644
--- a/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/permission/assign/RoleUnifiedAssignService.java
+++ b/daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/permission/assign/RoleUnifiedAssignService.java
@@ -65,15 +65,31 @@ public class RoleUnifiedAssignService {
         List<RoleMenu> roleMenus = roleMenuManager.findAllByRole(roleId);
         List<RoleCode> roleCodes = roleCodeManager.findAllByRole(roleId);
 
-        Set<Long> checkedMenuIds = roleMenus.stream().map(RoleMenu::getMenuId).collect(Collectors.toCollection(HashSet::new));
-        Set<Long> checkedCodeIds = roleCodes.stream().map(RoleCode::getCodeId).collect(Collectors.toCollection(HashSet::new));
-
         // 权限码主数据不区分终端，查询时需要按 menuCode 挂载到当前终端下的菜单实例。
         Map<String, List<PermCodeData>> codeMapByMenuCode = allCodes.stream()
                 .filter(item -> item.getId() != null)
                 .filter(item -> item.getMenuCode() != null && !item.getMenuCode().isBlank())
                 .collect(Collectors.groupingBy(PermCodeData::getMenuCode));
 
+        // 角色菜单/权限码分配跨终端共用一张关系表，需以当前终端为白名单过滤勾选态，
+        // 否则其他终端的分配会被计入，前端出现"已选数 > 总数"（如菜单 34/33）
+        Set<Long> menuIdInClient = menus.stream().map(PermMenu::getId).collect(Collectors.toCollection(HashSet::new));
+        // 当前终端树中实际出现的权限码：当前终端菜单的 menuCode 对应的全部权限码
+        Set<Long> codeIdInTree = menus.stream()
+                .map(PermMenu::getMenuCode)
+                .filter(mc -> mc != null && !mc.isBlank())
+                .flatMap(mc -> codeMapByMenuCode.getOrDefault(mc, List.of()).stream())
+                .map(PermCodeData::getId)
+                .collect(Collectors.toCollection(HashSet::new));
+        Set<Long> checkedMenuIds = roleMenus.stream()
+                .map(RoleMenu::getMenuId)
+                .filter(menuIdInClient::contains)
+                .collect(Collectors.toCollection(HashSet::new));
+        Set<Long> checkedCodeIds = roleCodes.stream()
+                .map(RoleCode::getCodeId)
+                .filter(codeIdInTree::contains)
+                .collect(Collectors.toCollection(HashSet::new));
+
         // 构建统一扁平节点列表：菜单节点 + 权限码节点
         List<RoleUnifiedAssignTreeResult> allNodes = new ArrayList<>();
         Map<Long, String> menuIdToTreeIdMap = new HashMap<>();