From 956c6a3fda3d5d9f1c52392facafe6fd69f5a656 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期一, 11 九月 2023 10:15:16 +0800
Subject: [PATCH] 数据权限列表
---
server/src/main/resources/mappers/SystemMenuMapper.xml | 6 +++---
server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java | 2 ++
server/src/main/java/doumeemes/dao/system/model/SystemMenu.java | 4 ++++
server/src/main/java/doumeemes/dao/system/vo/SystemMenuNodeVO.java | 3 +++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
index c506031..7948b7b 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemMenuBizImpl.java
@@ -158,6 +158,7 @@
nodeVO.setIndex("menu_" + menu.getId());
nodeVO.setLabel(menu.getName());
nodeVO.setUrl(menu.getPath());
+ nodeVO.setUrlSec(menu.getPathSec());
nodeVO.setIcon(menu.getIcon());
nodeVO.setChildren(new ArrayList<>());
rootNodes.add(nodeVO);
@@ -245,6 +246,7 @@
child.setId(menu.getId());
child.setLabel(menu.getName());
child.setUrl(menu.getPath());
+ child.setUrlSec(menu.getPathSec());
child.setIcon(menu.getIcon());
child.setIndex("menu_" + menu.getId());
child.setChildren(new ArrayList<>());
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemMenu.java b/server/src/main/java/doumeemes/dao/system/model/SystemMenu.java
index 4b732fb..7bbae6a 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemMenu.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemMenu.java
@@ -39,6 +39,10 @@
@ApiModelProperty(value = "鑿滃崟璁块棶璺緞")
private String path;
+ @ApiModelProperty(value = "灏忕▼搴忚彍鍗曡闂矾寰�")
+ private String pathSec;
+
+
@ApiModelProperty(value = "澶囨敞")
private String remark;
diff --git a/server/src/main/java/doumeemes/dao/system/vo/SystemMenuNodeVO.java b/server/src/main/java/doumeemes/dao/system/vo/SystemMenuNodeVO.java
index d0ee6fa..f05a878 100644
--- a/server/src/main/java/doumeemes/dao/system/vo/SystemMenuNodeVO.java
+++ b/server/src/main/java/doumeemes/dao/system/vo/SystemMenuNodeVO.java
@@ -30,6 +30,9 @@
@ApiModelProperty(value = "鑿滃崟鍦板潃")
private String url;
+ @ApiModelProperty(value = "灏忕▼搴忚彍鍗曞湴鍧�")
+ private String urlSec;
+
@ApiModelProperty(value = "绫诲瀷 0骞冲彴 1浼佷笟PC绔� 2浼佷笟鎵嬫満绔�", example = "1")
private Integer type;
@ApiModelProperty(value = "瀛愯彍鍗�")
diff --git a/server/src/main/resources/mappers/SystemMenuMapper.xml b/server/src/main/resources/mappers/SystemMenuMapper.xml
index b19941b..a756c45 100644
--- a/server/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/src/main/resources/mappers/SystemMenuMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" parameterType="doumeemes.dao.system.dto.QuerySystemMenuDTO" resultMap="SystemMenuListVO">
SELECT
- menu.`TYPE`,menu.`MODULE_ID`, menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`FIXED`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,
+ menu.`TYPE`,menu.`MODULE_ID`, menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`FIXED`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,menu.PATH_SEC,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_MENU menu
@@ -37,7 +37,7 @@
<!-- 鏌ヨ鑿滃崟鏍� -->
<select id="selectByUserId" resultType="doumeemes.dao.system.model.SystemMenu">
SELECT
- DISTINCT menu.`ID`, menu.`TYPE`,menu.`MODULE_ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
+ DISTINCT menu.`ID`, menu.`TYPE`,menu.`MODULE_ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,menu.PATH_SEC
FROM `SYSTEM_MENU` menu
INNER JOIN SYSTEM_ROLE_MENU role_menu ON role_menu.MENU_ID = menu.ID AND role_menu.DELETED = 0
INNER JOIN SYSTEM_USER_ROLE user_role ON user_role.ROLE_ID = role_menu.ROLE_ID AND user_role.DELETED = 0
@@ -59,7 +59,7 @@
<!-- 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鍒楄〃 -->
<select id="selectByRoleId" parameterType="java.lang.Integer" resultType="doumeemes.dao.system.model.SystemMenu">
SELECT
- menu.`TYPE`,menu.`MODULE_ID`, menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`
+ menu.`TYPE`,menu.`MODULE_ID`, menu.`ID`, menu.`PARENT_ID`, menu.`NAME`, menu.`PATH`, menu.`REMARK`, menu.`DISABLED`, menu.SORT, menu.`ICON`, menu.`CREATE_TIME`, menu.`UPDATE_TIME`, menu.`CREATE_USER`, menu.`UPDATE_USER`, menu.`DELETED`,menu.PATH_SEC
FROM `SYSTEM_MENU` menu
INNER JOIN `SYSTEM_ROLE_MENU` role_menu ON role_menu.MENU_ID = menu.ID AND role_menu.DELETED = 0
<where>
--
Gitblit v1.9.3