From d06c577a634528b11bc4b83c2769f48992913cad Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十月 2023 09:07:30 +0800
Subject: [PATCH] 修复bug

---
 server/services/src/main/resources/mappers/SystemUserMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/resources/mappers/SystemUserMapper.xml b/server/services/src/main/resources/mappers/SystemUserMapper.xml
index cda835b..9ae4ea2 100644
--- a/server/services/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/services/src/main/resources/mappers/SystemUserMapper.xml
@@ -63,12 +63,13 @@
     select
     distinct
     usr.id, usr.birthday, usr.email, usr.emp_no, usr.mobile, usr.avatar, usr.username, usr.realname, usr.sex, usr.fixed, usr.create_time, usr.update_time,
-    usr.admin_type,usr.user_type,usr.nickname,usr.accepted_number,usr.total_integral,usr.type,
+    usr.nickname,usr.status,
     create_user.id create_user_id, create_user.username create_user_name,
     update_user.id updete_user_id, update_user.username update_user_name
     from "system_user" usr
     left join "system_user" create_user on create_user.id = usr.create_user
     left join "system_user" update_user on update_user.id = usr.update_user
+    left join "system_user_role" sur on sur.user_id = usr.id
     <where>
       usr.deleted = 0
       <if test="dto.username != null and dto.username != ''">
@@ -80,9 +81,14 @@
       <if test="dto.mobile != null and dto.mobile != ''">
         AND usr.mobile  LIKE '%'||#{dto.mobile}||'%'
       </if>
+      <if test="dto.status != null ">
+        AND usr.status  = #{dto.status}
+      </if>
+      <if test="dto.roleId != null and dto.roleId != ''">
+        AND sur.role_id  = #{dto.roleId}
+      </if>
 
     </where>
-    order by usr.accepted_number desc
   </select>
 
 

--
Gitblit v1.9.3