From 8490eb11583ffdc586436f165860de5cfc39f915 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:18:29 +0800
Subject: [PATCH] fix:sql查询时间调整

---
 screen-api/src/main/resources/mapper/MenuMapper.xml |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/MenuMapper.xml b/screen-api/src/main/resources/mapper/MenuMapper.xml
index abfa655..2634fdb 100644
--- a/screen-api/src/main/resources/mapper/MenuMapper.xml
+++ b/screen-api/src/main/resources/mapper/MenuMapper.xml
@@ -20,7 +20,7 @@
     </sql>
 
     <select id="selectUserMenu" resultMap="BaseResultMap">
-        select
+        SELECT
         <include refid="Base_Column_List"/>
         FROM `user_group` ug,`group_menu` gm,`menu` m
         WHERE ug.user_id = #{userId}
@@ -28,19 +28,18 @@
         AND gm.menu_id = m.id
         AND ug.is_delete = 0
         AND gm.is_delete = 0
-        AND gm.channel_key = 1
+        AND gm.channel_key = 0
         AND m.is_delete = 0
     </select>
 
     <select id="selectOrganizationMenu" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        FROM `menu` m, `organization_menu` om
-        WHERE om.organization_id = #{orgId}
-        AND m.id = om.menu_id
-        AND om.channel_key = 1
-        AND om.menu_id = m.id
-        AND om.is_delete = 0
+        SELECT
+        DISTINCT m.id, m.name, m.url, m.icon, m.parent_id, m.order, m.create_time, m.update_time
+        FROM `menu` m, `group_menu` gm
+        WHERE gm.organization_id = #{orgId}
+        AND m.id = gm.menu_id
+        AND gm.channel_key = 0
+        AND gm.is_delete = 0
         AND m.is_delete = 0
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0