From 312fba0280bd1f4b5405a5b9fce9b898b9a50adf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 12 Jul 2023 19:05:50 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 869b6e9..af62c8e 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 = 'newapp' or menu.name = 'app')
+ and menu.parent_id = #{param1} and (menu.name = 'web' or menu.name = 'newWeb' or menu.name = 'app')
</when>
<otherwise>
and menu.parent_id = #{param1}
@@ -533,7 +533,7 @@
<!--查询菜单列表（排除 web,app 之外的菜单）-->
<select id="grantTreeNew" resultMap="treeNodeResultMap">
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') CONNECT BY PRIOR id = parent_id order by sort asc
+ where is_deleted = 0 start with ( name = 'web' or name = 'app' or name = 'newWeb') CONNECT BY PRIOR id = parent_id order by sort asc
</select>
</mapper>
--
Gitblit v1.9.3