From 79bf7f5f4a2862a5327c21368e62da0465dbcd43 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sun, 5 Jan 2025 10:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/system/api/domain/SysRole.java | 13 +++++++++++++ .../com/bonus/system/domain/UserMenuParams.java | 6 +++--- .../system/service/impl/SysRoleServiceImpl.java | 2 ++ .../main/resources/mapper/system/SysMenuMapper.xml | 2 +- .../main/resources/mapper/system/SysRoleMapper.xml | 9 ++++++++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index bccbb12..83570b2 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -65,6 +65,11 @@ public class SysRole extends BaseEntity /** 部门组（数据权限） */ private Long[] deptIds; + /** + * 所属公司ID + */ + private Long companyId; + /** 角色菜单权限 */ private Set permissions; @@ -216,6 +221,14 @@ public class SysRole extends BaseEntity this.deptIds = deptIds; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + public Set getPermissions() { return permissions; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java index c425b74..c5c6b85 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/UserMenuParams.java @@ -9,14 +9,14 @@ import lombok.Data; public class UserMenuParams { private Long userId; private Long systemType; - private Long menuTemplateId; + private Long templateId; UserMenuParams(){} - public UserMenuParams(Long userId, Long systemType, Long menuTemplateId){ + public UserMenuParams(Long userId, Long systemType, Long templateId){ this.userId = userId; this.systemType = systemType; - this.menuTemplateId = menuTemplateId; + this.templateId = templateId; } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index f68cb20..5a9218e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -73,6 +73,7 @@ public class SysRoleServiceImpl implements ISysRoleService String str = role.getRoleKey().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); role.setRoleKey(str); } + role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); return roleMapper.selectRoleList(role); } @@ -253,6 +254,7 @@ public class SysRoleServiceImpl implements ISysRoleService public int insertRole(SysRole role) { // 新增角色信息 + role.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); roleMapper.insertRole(role); return insertRoleMenu(role); } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml index c78fa9e..6736ebf 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -111,7 +111,7 @@ where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0 AND FIND_IN_SET(#{systemType}, m.system_type) AND exists ( - select 0 from sys_template_menu stm where stm.temp_id = #{menuTemplateId} and stm.menu_id = m.menu_id + select 0 from sys_template_menu stm where stm.temp_id = #{templateId} and stm.menu_id = m.menu_id ) order by m.parent_id, m.order_num diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index d1f9393..3459b64 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark, r.is_built_in + r.company_id, r.status, r.del_flag, r.create_time, r.remark, r.is_built_in from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id @@ -40,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.role_name like concat('%', #{roleName}, '%') + + AND r.company_id = #{companyId} + AND r.status = #{status} @@ -103,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" data_scope, menu_check_strictly, dept_check_strictly, + company_id, status, remark, create_by, @@ -116,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{dataScope}, #{menuCheckStrictly}, #{deptCheckStrictly}, + #{companyId}, #{status}, #{remark}, #{createBy}, @@ -133,6 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" data_scope = #{dataScope}, menu_check_strictly = #{menuCheckStrictly}, dept_check_strictly = #{deptCheckStrictly}, + company_id = #{companyId}, status = #{status}, remark = #{remark}, update_by = #{updateBy},