From 01e6384e271b1eedcfde976eb8084fd85c7ae0b6 Mon Sep 17 00:00:00 2001 From: ranke <213539@qq.com> Date: Tue, 27 Jan 2026 09:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=B8=BA"?= =?UTF-8?q?=E4=BB=85=E6=9C=AC=E4=BA=BA=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?"=E6=97=B6=E5=80=99,=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98:=20http:?= =?UTF-8?q?//172.16.46.63:31560/index.php=3Fm=3Dtask&f=3Dview&taskID=3D715?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/rule/dept/DeptDataPermissionRule.java | 7 +++++-- .../datapermission/config/DataPermissionConfiguration.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java b/zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java index 4a4befdb..1294e3c8 100644 --- a/zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java +++ b/zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java @@ -96,7 +96,6 @@ public class DeptDataPermissionRule implements DataPermissionRule { /** * 基于用户的表字段配置 * 一般情况下，每个表的部门编号字段是 dept_id，通过该配置自定义。 - * key：表名 * value：字段名 */ private final Map userColumns = new HashMap<>(); @@ -262,7 +261,11 @@ public class DeptDataPermissionRule implements DataPermissionRule { if (Boolean.FALSE.equals(self)) { return null; } - String columnName = userColumns.get(tableName); + String userColumnsKey = tableName; + if (StrUtil.isNotBlank(workCode)) { + userColumnsKey = userColumnsKey + "_work_code"; + } + String columnName = userColumns.get(userColumnsKey); if (StrUtil.isEmpty(columnName)) { return null; } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/datapermission/config/DataPermissionConfiguration.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/datapermission/config/DataPermissionConfiguration.java index def9db9b..78725a5e 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/datapermission/config/DataPermissionConfiguration.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/framework/datapermission/config/DataPermissionConfiguration.java @@ -24,6 +24,7 @@ public class DataPermissionConfiguration { rule.addDeptColumn(DeptDO.class, "id"); // user rule.addUserColumn(AdminUserDO.class, "id"); + rule.addUserColumn("system_users_work_code", "workcode"); }; }