diff --git a/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java index 6e55ff47..c6bcab4b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java @@ -75,6 +75,8 @@ public class TenantConfig { // 过滤自定义查询此时无租户信息约束出现 if ("com.jsh.erp.datasource.mappers.UserMapperEx.getUserListByUserNameOrLoginName".equals(ms.getId())) { return true; + } else if ("com.jsh.erp.datasource.mappers.RoleMapperEx.getRoleWithoutTenant".equals(ms.getId())) { + return true; } return false; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java index 969a0cd4..9f8977e5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/RoleMapperEx.java @@ -18,4 +18,7 @@ public interface RoleMapperEx { @Param("name") String name); int batchDeleteRoleByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); + + Role getRoleWithoutTenant( + @Param("roleId") Long roleId); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java index ee3a31d5..856d25ce 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -183,4 +183,8 @@ public class RoleService { } return result; } + + public Role getRoleWithoutTenant(Long roleId) { + return roleMapperEx.getRoleWithoutTenant(roleId); + } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index 79d2e807..3026d6a7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -750,7 +750,7 @@ public class UserService { if(valueArray.length>0) { roleId = valueArray[0]; } - Role role = roleService.getRole(Long.parseLong(roleId)); + Role role = roleService.getRoleWithoutTenant(Long.parseLong(roleId)); if(role!=null) { return role.getType(); } else { diff --git a/jshERP-boot/src/main/resources/mapper_xml/RoleMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/RoleMapperEx.xml index fde477a9..60331655 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/RoleMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/RoleMapperEx.xml @@ -35,4 +35,10 @@ ) + \ No newline at end of file