From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml
index 252db7a..5413003 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml
@@ -61,7 +61,7 @@
<if test="param1!=null">
<choose>
<when test="param2.super!=null and param1==0">
- and menu.parent_id = #{param1} and (menu.name = 'web' or menu.name = 'app')
+ and menu.parent_id = #{param1} and (menu.name = 'web' or menu.name = 'newWeb' or menu.name='superWeb' or menu.name = 'app')
</when>
<otherwise>
and menu.parent_id = #{param1}
@@ -483,14 +483,16 @@
</select>
<select id="selectAppMenu" resultType="cn.gistack.system.vo.MenuVO">
- SELECT MENU.* FROM BLADE_MENU MENU
+ SELECT DISTINCT MENU.* FROM BLADE_MENU MENU
LEFT JOIN BLADE_MENU TOPMENU ON TOPMENU.ID = MENU.PARENT_ID
LEFT JOIN BLADE_ROLE_MENU BRM ON BRM.MENU_ID = MENU.ID
WHERE TOPMENU.NAME='app'
- AND BRM.ROLE_ID = #{roleId}
+ AND BRM.ROLE_ID IN
+ <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
AND MENU.IS_DELETED = 0
- ORDER BY MENU.SORT ASC
-
+ ORDER BY MENU.SORT ASC
</select>
<resultMap id="webMenu" type="cn.gistack.system.vo.WebMenuVO">
@@ -530,8 +532,8 @@
<!--查询菜单列表（排除 web,app 之外的菜单）-->
<select id="grantTreeNew" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from YWXT.blade_menu
- where is_deleted = 0 start with ( name = 'web' or name = 'app') CONNECT BY PRIOR id = parent_id order by sort asc
+ select id, parent_id, name as title, id as "value", id as "key" from blade_menu
+ where is_deleted = 0 start with ( name = 'web' or name = 'app' or name = 'newWeb' or name ='superWeb') CONNECT BY PRIOR id = parent_id order by sort asc
</select>
</mapper>
--
Gitblit v1.9.3