From 730443b70de88d328ffa275f51f69280fda979e4 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 12:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/resources/mapper/MenuMapper.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/user-server/src/main/resources/mapper/MenuMapper.xml b/user-server/src/main/resources/mapper/MenuMapper.xml
index 8a36cca..6d55185 100644
--- a/user-server/src/main/resources/mapper/MenuMapper.xml
+++ b/user-server/src/main/resources/mapper/MenuMapper.xml
@@ -3,11 +3,15 @@
 <mapper namespace="com.yuanchu.limslaboratory.mapper.MenuMapper">
 
     <select id="getMenuList" resultType="com.yuanchu.limslaboratory.pojo.Menu">
-        select id,name,parent_id parentId
+        select id, name, parent_id parentId
         from menu
-        where state =1
+        where state = 1
+          and id != 39
+       and parent_id != 39
     </select>
     <select id="getMenuNameAndId" resultType="map">
-        select url,id,name from menu where state=1
+        select url, id, name
+        from menu
+        where state = 1
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3