From 3e01554ae52fcc979ff1b528594706b840ab071d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E7=8B=BC=E8=93=9D=E5=A4=A9?= <mllt9920@qq.com>
Date: Mon, 18 Nov 2024 18:22:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../harmony/service/impl/UserServiceImpl.java |  3 ++
 src/main/resources/mapper/UserMapper.xml      | 32 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java b/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java
index 82e74a7..37866c5 100644
--- a/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/guaiguailang/harmony/service/impl/UserServiceImpl.java
@@ -116,6 +116,9 @@ public class UserServiceImpl implements UserService {
         Map<String, Object> queryConditions = new HashMap<>();
         queryConditions.put("excludeUid", uid);
         queryConditions.put("currentLevel", currentLevel); // 添加当前用户的等级作为查询条件
+        System.out.println("==============================" +
+                queryConditions.toString() +
+                "============================");
         List<UserInfo>  userInfos;
         log.info("要查询的用户类型是：{}", userListParam.getUserType());
         if (Objects.equals(userListParam.getUserType(), "activate")) {
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 3b47e49..60e11e5 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -41,24 +41,40 @@
     </select>
 
     <!-- getUserListAll 方法 -->
+<!--    <select id="getUserListAll" resultType="com.guaiguailang.harmony.domain.entity.UserInfo">-->
+<!--        SELECT * FROM user_info-->
+<!--        <where>-->
+<!--        <if test="merchantCode != 'ALL'">-->
+<!--            WHERE merchant_code = #{merchantCode}-->
+<!--        </if>-->
+<!--        <if test="queryConditions.excludeUid != null">-->
+<!--            AND id != #{queryConditions.excludeUid}-->
+<!--        </if>-->
+<!--            <if test="queryConditions.currentLevel != null">-->
+<!--                AND role_id IN (-->
+<!--                SELECT role_id FROM system_role WHERE level >= #{queryConditions.currentLevel}-->
+<!--                )-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        LIMIT #{limit},#{end}-->
+<!--    </select>-->
     <select id="getUserListAll" resultType="com.guaiguailang.harmony.domain.entity.UserInfo">
         SELECT * FROM user_info
         <where>
-        <if test="merchantCode != 'ALL'">
-            WHERE merchant_code = #{merchantCode}
-        </if>
-        <if test="queryConditions.excludeUid != null">
-            AND id != #{queryConditions.excludeUid}
-        </if>
+            <if test="merchantCode != 'ALL'">
+                merchant_code = #{merchantCode}
+            </if>
+            <if test="queryConditions.excludeUid != null">
+                AND id != #{queryConditions.excludeUid}
+            </if>
             <if test="queryConditions.currentLevel != null">
                 AND role_id IN (
                 SELECT role_id FROM system_role WHERE level >= #{queryConditions.currentLevel}
                 )
             </if>
         </where>
-        LIMIT #{limit},#{end}
+        LIMIT #{limit}, #{end}
     </select>
-
     <select id="getUserListNum" resultType="com.guaiguailang.harmony.domain.vo.UserListNum">
         SELECT
         SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS userActivatedNum,