From 1566d127ec98f8a0c9cfcfcc8bc579fa7dfbcdc1 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Sat, 4 Jan 2025 22:31:36 +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 --- .../com/bonus/system/api/domain/SysDept.java | 12 +++++++++++ .../com/bonus/system/api/domain/SysMenu.java | 10 ++++++++++ .../service/impl/SysMenuServiceImpl.java | 7 +++++++ .../resources/mapper/system/SysDeptMapper.xml | 2 ++ .../resources/mapper/system/SysMenuMapper.xml | 20 ++++++++++++------- 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java index e30f1c9..80ec1ef 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java @@ -73,6 +73,10 @@ public class SysDept extends BaseEntity { * 父部门名称 */ private String parentName; + + //权限模版ID + private Long templateId; + /** * 省 */ @@ -115,6 +119,14 @@ public class SysDept extends BaseEntity { private String keyWord; + public Long getTemplateId() { + return templateId; + } + + public void setTemplateId(Long templateId) { + this.templateId = templateId; + } + public void setCity(String city) { this.city = city; } diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysMenu.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysMenu.java index e916afb..75169a6 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysMenu.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysMenu.java @@ -72,6 +72,8 @@ public class SysMenu extends BaseEntity /** 系统类型 */ private String systemType; + private Long templateId; + public Long getMenuId() { return menuId; @@ -247,6 +249,14 @@ public class SysMenu extends BaseEntity this.systemType = systemType; } + public Long getTemplateId() { + return templateId; + } + + public void setTemplateId(Long templateId) { + this.templateId = templateId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java index c93f74a..bb88d7d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java @@ -9,8 +9,10 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import com.bonus.system.api.domain.SysDept; import com.bonus.system.api.domain.SysMenu; import com.bonus.system.domain.UserMenuParams; +import com.bonus.system.mapper.SysDeptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.common.core.constant.Constants; @@ -45,6 +47,9 @@ public class SysMenuServiceImpl implements ISysMenuService @Autowired private SysRoleMenuMapper roleMenuMapper; + @Autowired + private SysDeptMapper deptMapper; + /** * 根据用户查询系统菜单列表 * @@ -70,6 +75,8 @@ public class SysMenuServiceImpl implements ISysMenuService String str = menu.getMenuName().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); menu.setMenuName(str); } + SysDept sysDept = deptMapper.selectDeptById(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + menu.setTemplateId(sysDept.getTemplateId()); List menuList = menuMapper.selectMenuList(menu); return menuList; } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml index fd91c1c..077bdfc 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.del_flag, d.create_by, d.create_time, + d.template_id, d.province, d.city, d.district, 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 4a6b8ea..18d95b3 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 @@ -29,21 +29,27 @@ - select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time, system_type - from sys_menu + select sm.menu_id, sm.menu_name, sm.parent_id, sm.order_num, sm.path, sm.component, sm.`query`, sm.is_frame, + sm.is_cache, sm.menu_type, sm.visible, sm.status, ifnull(sm.perms,'') as perms, sm.icon, sm.create_time, sm.system_type + from sys_menu sm - where menu_id = #{menuId} + where sm.menu_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 + where sm.menu_name=#{menuName} and sm.parent_id = #{parentId} limit 1