From a835b874ad251d76307d235d7e658491094a46d2 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 10 Aug 2026 16:34:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(message):=20notice=5Frole=E4=BB=85=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E8=8F=9C=E5=8D=95=E5=8F=AF=E8=A7=81=EF=BC=8C=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=AA=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=9C=AC=E4=BA=BA?= =?UTF-8?q?=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - applyAdminPermissionFilter 白名单移除 notice_role，使其落入兜底分支 - 兜底过滤字段由 loginUser.getId() 修正为 getUsername()，对齐 createBy 存储 --- .../service/impl/SysMessageNoticeServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java index 7830b1d..cb1c575 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java @@ -188,14 +188,13 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl wrapper) { LoginUser loginUser = GlobalUtils.getLoginUser(); /* - * 1.后台接口的消息列表需要做一定数据权限控制需考虑的角色有admin,system,second_manager,third_manager,notice_role - * 2.admin,system,notice_role可查看所有的消息通知 + * 1.后台接口的消息列表需要做一定数据权限控制需考虑的角色有admin,system,second_manager,third_manager + * 2.admin,system可查看所有的消息通知 * 3.second_manager,third_manager可查看管理单位下的消息列表 - * 4.未命中上述白名单的角色，兜底只可查看本人创建的消息通知 */ boolean permissions = false; List roleCodes = Arrays.asList(Objects.toString(loginUser.getRoleCodes(), "").split(",")); - if (roleCodes.contains(RoleEnum.ADMIN_MANAGER.roleName) || roleCodes.contains(RoleEnum.SYSTEM.roleName) || roleCodes.contains(RoleEnum.WEIGHT_PLAN_ADMIN.roleName) || roleCodes.contains(RoleEnum.NOTICE_ROLE.roleName)) { + if (roleCodes.contains(RoleEnum.ADMIN_MANAGER.roleName) || roleCodes.contains(RoleEnum.SYSTEM.roleName)) { permissions = true; } else if (roleCodes.contains(RoleEnum.SECOND_MANAGER.roleName)) { if (StrUtil.isNotEmpty(loginUser.getDepartCodes())) { @@ -205,7 +204,7 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl