From dfa74d70bc18445534c120a27b4b9260aeb2e2f3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十月 2023 10:04:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
index c4d87b5..6877a21 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/MenuMapper.xml
@@ -221,7 +221,13 @@
</select>
<select id="grantTree" resultMap="treeNodeResultMap">
- select id, parent_id, name as title, id as "value", id as "key" from pl_sys_menu where is_deleted = 0 order by sort
+ select
+ id,
+ parent_id,
+ name as title,
+ id as "value",
+ id as "key"
+ from pl_sys_menu where is_deleted = 0 order by sort
</select>
<select id="grantTreeByRole" resultMap="treeNodeResultMap">
@@ -478,9 +484,9 @@
<select id="selectMenuChildByBtnType" resultMap="menuResultMap">
select pm.*
from pl_sys_menu ps, pl_sys_menu pm
- where ps.is_deleted = 0
+ where pm.is_deleted = 0
and ps.category = 1
- and ps.alias = #{btmType}
+ and ps.CODE = #{btmType}
and ps.id = pm.parent_id order by pm.sort asc
</select>
--
Gitblit v1.9.3