From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/service/src/main/resources/mappers/SystemMenuMapper.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/service/src/main/resources/mappers/SystemMenuMapper.xml b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
index 39df661..f270a4d 100644
--- a/server/service/src/main/resources/mappers/SystemMenuMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemMenuMapper.xml
@@ -20,10 +20,10 @@
       create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
       update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
     FROM SYSTEM_MENU menu
-     JOIN `SYSTEM_USER` create_user ON create_user.ID = menu.CREATE_USER
+    LEFT 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