From 9a1725d106a100133f18f3ab7ca43cbcf422b23a Mon Sep 17 00:00:00 2001
From: sunjiabei <sjb3125@163.com>
Date: Tue, 22 Jul 2025 11:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BAsql=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/RoleMapper.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml
index 11d38d6..57a84e9 100644
--- a/src/main/resources/mapper/RoleMapper.xml
+++ b/src/main/resources/mapper/RoleMapper.xml
@@ -65,6 +65,9 @@
         -- 自连接，通过 father_id 关联父角色
         LEFT JOIN role father ON r.father_id = father.id
         <where>
+            <if test="roleName != null and roleName != ''">
+                r.role_name LIKE CONCAT('%', #{roleName}, '%')
+            </if>
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
             <if test="markets != null and markets.size() > 0 and '总部' not in markets">
                 AND r.market IN
@@ -72,9 +75,6 @@
                     #{market}
                 </foreach>
             </if>
-            <if test="roleName != null and roleName != ''">
-                r.role_name LIKE CONCAT('%', #{roleName}, '%')
-            </if>
         </where>
         ORDER BY r.priority DESC
     </select>