From 35cd63ec7d82f783b84ef4e94c6a407efa211521 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 16 Jun 2025 21:55:51 +0800
Subject: [PATCH] =?UTF-8?q?chore(system):=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/MenuMapper.xml         |  7 +++----
 .../src/main/resources/mapper/MessageMapper.xml      | 12 ++++++------
 .../src/main/resources/mapper/NoticeMapper.xml       |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/continew-system/src/main/resources/mapper/MenuMapper.xml b/continew-system/src/main/resources/mapper/MenuMapper.xml
index ff0c4deb..8007e0eb 100644
--- a/continew-system/src/main/resources/mapper/MenuMapper.xml
+++ b/continew-system/src/main/resources/mapper/MenuMapper.xml
@@ -16,9 +16,8 @@
     <select id="selectListByRoleId" resultType="top.continew.admin.system.model.entity.MenuDO">
         SELECT t1.*
         FROM sys_menu AS t1
-            LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id
-            LEFT JOIN sys_role AS t3 ON t3.id = t2.role_id
-        WHERE t3.id = #{roleId}
-          AND t1.status = 1
+        LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id
+        LEFT JOIN sys_role AS t3 ON t3.id = t2.role_id
+        WHERE t3.id = #{roleId} AND t1.status = 1
     </select>
 </mapper>
\ No newline at end of file
diff --git a/continew-system/src/main/resources/mapper/MessageMapper.xml b/continew-system/src/main/resources/mapper/MessageMapper.xml
index a3fb582c..8a3e593c 100644
--- a/continew-system/src/main/resources/mapper/MessageMapper.xml
+++ b/continew-system/src/main/resources/mapper/MessageMapper.xml
@@ -14,7 +14,7 @@
             t2.read_time IS NOT NULL AS isRead,
             t2.read_time AS readTime
         FROM sys_message AS t1
-            LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id
+        LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id
         <where>
             <if test="query.userId != null">
                 (t1.scope = 1 OR (t1.scope = 2 AND JSON_EXTRACT(t1.users, "$[0]") = CAST(#{query.userId} AS CHAR)))
@@ -45,7 +45,7 @@
             t2.read_time IS NOT NULL AS isRead,
             t2.read_time AS readTime
         FROM sys_message AS t1
-            LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id
+        LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id
         WHERE t1.id = #{id}
     </select>
 
@@ -53,7 +53,7 @@
         SELECT
             t1.*
         FROM sys_message AS t1
-            LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id AND t2.user_id = #{userId}
+        LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id AND t2.user_id = #{userId}
         WHERE (t1.scope = 1 OR (t1.scope = 2 AND JSON_CONTAINS(t1.users, CONCAT('"', #{userId}, '"'))))
         AND t2.read_time IS NULL
     </select>
@@ -62,11 +62,11 @@
         SELECT
             COUNT(1)
         FROM sys_message AS t1
-            LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id AND t2.user_id = #{userId}
+        LEFT JOIN sys_message_log AS t2 ON t2.message_id = t1.id AND t2.user_id = #{userId}
         WHERE (t1.scope = 1 OR (t1.scope = 2 AND JSON_CONTAINS(t1.users, CONCAT('"', #{userId}, '"'))))
         AND t2.read_time IS NULL
-          <if test="type != null">
+        <if test="type != null">
             AND t1.type = #{type}
-          </if>
+        </if>
     </select>
 </mapper>
diff --git a/continew-system/src/main/resources/mapper/NoticeMapper.xml b/continew-system/src/main/resources/mapper/NoticeMapper.xml
index 06f1a2bb..eb837636 100644
--- a/continew-system/src/main/resources/mapper/NoticeMapper.xml
+++ b/continew-system/src/main/resources/mapper/NoticeMapper.xml
@@ -43,7 +43,7 @@
 
     <select id="selectUnreadIdsByUserId" resultType="java.lang.Long">
         SELECT
-        t1.id
+            t1.id
         FROM sys_notice AS t1
         LEFT JOIN sys_notice_log AS t2 ON t2.notice_id = t1.id AND t2.user_id = #{userId}
         WHERE (t1.notice_scope = 1 OR (t1.notice_scope = 2 AND JSON_CONTAINS(t1.notice_users, CONCAT('"', #{userId}, '"'))))