From c5850a36b271b4bd082bd8c1cc32e0dd85a2eb57 Mon Sep 17 00:00:00 2001
From: Default User <user@example.com>
Date: Tue, 20 Jan 2026 17:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E7=9A=84managerName=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=B0=E6=89=80=E6=9C=89=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/main/resources/mapper/UsersMapper.xml | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/web/src/main/resources/mapper/UsersMapper.xml b/web/src/main/resources/mapper/UsersMapper.xml
index 9e237e6..e28706e 100644
--- a/web/src/main/resources/mapper/UsersMapper.xml
+++ b/web/src/main/resources/mapper/UsersMapper.xml
@@ -14,6 +14,9 @@
             <if test="userName != null and userName != ''">
                 AND um.userName = #{userName}
             </if>
+            <if test="managerName != null and managerName != ''">
+                AND um.userName = #{managerName}
+            </if>
             <if test="managercompany != null and managercompany != ''">
                 AND um.managercompany = #{managercompany}
             </if>
@@ -45,6 +48,9 @@
             <if test="userName != null and userName != ''">
                 AND um.userName = #{userName}
             </if>
+            <if test="managerName != null and managerName != ''">
+                AND um.userName = #{managerName}
+            </if>
             <if test="managercompany != null and managercompany != ''">
                 AND um.managercompany = #{managercompany}
             </if>
@@ -74,12 +80,15 @@
             AND role = #{role}
         )
         AND u.type != 'Colleague'
+        <if test="managerName != null and managerName != ''">
+            AND EXISTS (SELECT 1 FROM usermanagements um WHERE um.userId = u.userId AND um.userName = #{managerName})
+        </if>
         ORDER BY u.created_at DESC
         LIMIT #{offset}, #{limit}
     </select>
     <select id="countByUserIds" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM users 
-        WHERE userId IN 
+        SELECT COUNT(*) FROM users u
+        WHERE u.userId IN 
         (
             SELECT userId FROM usermanagements 
             WHERE userName = #{userName}
@@ -88,7 +97,10 @@
             AND organization = #{organization}
             AND role = #{role}
         )
-            AND type != 'Colleague'
+        AND u.type != 'Colleague'
+        <if test="managerName != null and managerName != ''">
+            AND EXISTS (SELECT 1 FROM usermanagements um WHERE um.userId = u.userId AND um.userName = #{managerName})
+        </if>
     </select>
     
     <select id="findPublicWithPagination" resultType="com.example.web.entity.Users">
@@ -123,6 +135,9 @@
         OR (um.organization IS NOT NULL AND um.organization != '')
         OR (um.role IS NOT NULL AND um.role != '')
         OR (um.userName IS NOT NULL AND um.userName != ''))
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
         ORDER BY u.created_at DESC
         LIMIT #{offset}, #{limit}
     </select>
@@ -136,21 +151,32 @@
         OR (um.organization IS NOT NULL AND um.organization != '')
         OR (um.role IS NOT NULL AND um.role != '')
         OR (um.userName IS NOT NULL AND um.userName != ''))
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
     </select>
     
     <select id="findPersonalWithPagination" resultType="com.example.web.entity.Users">
-        SELECT * FROM users
+        SELECT u.*, um.userName as managerName FROM users u
+        JOIN usermanagements um ON u.userId = um.userId
         WHERE followup IS NOT NULL AND followup != ''
-        AND (sync_statuss IS NULL OR sync_statuss NOT IN (0, 1))
-        AND type != 'Colleague'
-        AND type != 'Colleague'
+        AND (u.sync_statuss IS NULL OR u.sync_statuss NOT IN (0, 1))
+        AND u.type != 'Colleague'
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
+        ORDER BY u.created_at DESC
         LIMIT #{offset}, #{limit}
     </select>
     
     <select id="countPersonal" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM users
-        WHERE followup IS NOT NULL AND followup != ''
-        AND (sync_statuss IS NULL OR sync_statuss NOT IN (0, 1))
+        SELECT COUNT(*) FROM users u
+        JOIN usermanagements um ON u.userId = um.userId
+        WHERE u.followup IS NOT NULL AND u.followup != ''
+        AND (u.sync_statuss IS NULL OR u.sync_statuss NOT IN (0, 1))
+        <if test="managerName != null and managerName != ''">
+            AND um.userName = #{managerName}
+        </if>
     </select>
     
     <select id="findPublicAllWithPagination" resultType="com.example.web.entity.Users">