From 9d72eb559e67e3f0bb321198fc562f3cfd9a8625 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 21 一月 2024 20:54:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index 80434cf..b368ed3 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -60,12 +60,13 @@
m.description,
m.create_time as createTime,
m.hidden,
- m.icon
+ m.icon,
+ m.sort
FROM ums_admin_role_relation arr
INNER JOIN `ums_role_menu_relation` AS rmr on rmr.role_id = arr.role_id
JOIN ums_menu AS m ON rmr.menu_id = m.id
- WHERE arr.admin_id = #{id}
- order by m.id
+ WHERE arr.admin_id = #{id} and m.hidden = false
+ order by m.sort
</select>
</mapper>
--
Gitblit v1.8.0