From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突
---
server/service/src/main/resources/mappers/SystemMenuMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/resources/mappers/SystemMenuMapper.xml b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
index 39df661..104ed0c 100644
--- a/server/service/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -23,7 +23,7 @@
JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = menu.UPDATE_USER
<where>
- menu.DELETED = 0
+ menu.DELETED = 0 and menu.type = #{type}
</where>
ORDER BY menu.SORT
</select>
@@ -39,6 +39,7 @@
AND menu.DELETED = 0
AND menu.DISABLED = 0
AND user_role.USER_ID = #{userId}
+ AND menu.TYPE = #{type}
</where>
ORDER BY menu.SORT
</select>
--
Gitblit v1.9.3