From 76d9d4af124631ffe68c5f8dfd2c6d54c61fcefa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:45:01 +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 | 7 +------
1 files changed, 1 insertions(+), 6 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 f07c1c3..9f8724b 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
@@ -531,12 +531,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' CONNECT BY PRIOR id = parent_id
- union all
- (
- select id, parent_id, name as title, id as "value", id as "key" from blade_menu
- where is_deleted = 0 start with name = 'app' CONNECT BY PRIOR id = parent_id
- )
+ 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