From ecb6bdd79e6a71c96862f889894fd9f7119a25ff Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sun, 4 Sep 2022 18:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95sql=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/userauth/SysEveMenuMapper.xml      | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml
index cff8e8b4..b3bed3ce 100644
--- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml
+++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveMenuMapper.xml
@@ -7,11 +7,11 @@
 			a.id,
 			a.menu_name menuName,
 			a.menu_name_en menuNameEn,
-			a.icon menuIcon,
-			a.icon_color menuIconColor,
-			a.icon_bg menuIconBg,
-			a.icon_type menuIconType,
-			a.icon_pic menuIconPic,
+			a.icon,
+			a.icon_color iconColor,
+			a.icon_bg iconBg,
+			a.icon_type iconType,
+			a.icon_pic iconPic,
 			a.menu_level menuLevel,
 			a.menu_parent_id parentId,
 			a.menu_url menuUrl,
@@ -28,28 +28,29 @@
 			sys_eve_menu a
 			LEFT JOIN sys_eve_menu c ON INSTR(CONCAT(',', a.menu_parent_id, ','), CONCAT(',', c.id, ','))
 			LEFT JOIN sys_eve_desktop d ON a.desktop_id = d.id
-		WHERE 1=1
-		<if test="menuName != '' and menuName != null">
-			AND a.menu_name LIKE '%${menuName}%'
-		</if>
-		<if test="parentMenuName != '' and parentMenuName != null">
-			AND c.menu_name LIKE '%${parentMenuName}%'
-		</if>
-		<if test="menuUrl != '' and menuUrl != null">
-			AND a.menu_url LIKE '%${menuUrl}%'
-		</if>
-		<if test="menuLevel != '' and menuLevel != null">
-			AND a.menu_level = #{menuLevel}
-		</if>
-		<if test="isShare != '' and isShare != null">
-			AND a.is_share = #{isShare}
-		</if>
-		<if test="parentId != '' and parentId != null and parentId != '0'.toString()">
-			AND a.sys_win_id = #{parentId}
-		</if>
-		<if test="desktopId != '' and desktopId != null">
-            AND a.desktop_id = #{desktopId}
-        </if>
+		<where>
+			<if test="menuName != '' and menuName != null">
+				AND a.menu_name LIKE '%${menuName}%'
+			</if>
+			<if test="parentMenuName != '' and parentMenuName != null">
+				AND c.menu_name LIKE '%${parentMenuName}%'
+			</if>
+			<if test="menuUrl != '' and menuUrl != null">
+				AND a.menu_url LIKE '%${menuUrl}%'
+			</if>
+			<if test="menuLevel != '' and menuLevel != null">
+				AND a.menu_level = #{menuLevel}
+			</if>
+			<if test="isShare != '' and isShare != null">
+				AND a.is_share = #{isShare}
+			</if>
+			<if test="parentId != '' and parentId != null and parentId != '0'.toString()">
+				AND a.sys_win_id = #{parentId}
+			</if>
+			<if test="desktopId != '' and desktopId != null">
+				AND a.desktop_id = #{desktopId}
+			</if>
+		</where>
 		GROUP BY a.id
 		ORDER BY a.order_num ASC
 	</select>