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 @@
AND um.userName = #{userName}
+
+ AND um.userName = #{managerName}
+
AND um.managercompany = #{managercompany}
@@ -45,6 +48,9 @@
AND um.userName = #{userName}
+
+ AND um.userName = #{managerName}
+
AND um.managercompany = #{managercompany}
@@ -74,12 +80,15 @@
AND role = #{role}
)
AND u.type != 'Colleague'
+
+ AND EXISTS (SELECT 1 FROM usermanagements um WHERE um.userId = u.userId AND um.userName = #{managerName})
+
ORDER BY u.created_at DESC
LIMIT #{offset}, #{limit}
@@ -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 != ''))
+
+ AND um.userName = #{managerName}
+