From a8d11819563fcd3d237f354574ccadb92ccf57e4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 May 2023 20:15:10 +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 | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 9292434..252db7a 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
@@ -59,7 +59,14 @@
blade_menu menu
WHERE menu.is_deleted = 0
<if test="param1!=null">
- and menu.parent_id = #{param1}
+ <choose>
+ <when test="param2.super!=null and param1==0">
+ and menu.parent_id = #{param1} and (menu.name = 'web' or menu.name = 'app')
+ </when>
+ <otherwise>
+ and menu.parent_id = #{param1}
+ </otherwise>
+ </choose>
</if>
<if test="param2.name!=null and param2.name!=''">
and menu.name like concat(concat('%', #{param2.name}),'%')
@@ -521,4 +528,10 @@
AND M.CATEGORY = 2 AND M.IS_DELETED = 0 AND M.BUTTON_REMARK = 'WEB'
</select>
+ <!--查询菜单列表（排除 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>
+
</mapper>
--
Gitblit v1.9.3