From 09eb8c51716fb3d967bc1751ca9a464720ac2ee4 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Thu, 18 May 2023 21:11:27 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8,=E8=A7=92=E8=89=B2=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sys/mysql/UserEOMapper.xml     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
index fef279e..f662eeb 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml
@@ -9,13 +9,15 @@
         GROUP_CONCAT( DISTINCT org.LONG_NAME ORDER BY org.ID DESC )as ORGNAME
         from
         (
-        select * from  TS_USER
-        where del_flag = 0
+        select tu.* from  TS_USER tu
+        left join TR_USER_ROLE tur on tu.USID=tur.USER_ID
+        left JOIN TS_ROLE tr on tur.ROLE_ID=tr.ID
+        where tu.del_flag = 0
             <if test="account !='' and account !=null">
                 and ACCOUNT like  CONCAT('%',CONCAT(#{account},'%'))
             </if>
             <if test="roleName !='' and roleName !=null">
-                and NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
+                and tr.NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
             </if>
         ORDER BY UPDATE_TIME DESC
         LIMIT #{current},#{size}
@@ -31,14 +33,17 @@
     </select>
 
     <select id="listCount" resultType="java.lang.Long">
-        select count(1) from  TS_USER
-        where del_flag = 0
+        select count(1) from TS_USER tu
+        left join TR_USER_ROLE tur on tu.USID=tur.USER_ID
+        left JOIN TS_ROLE tr on tur.ROLE_ID=tr.ID
+        where tu.del_flag = 0
         <if test="account !='' and account !=null">
             and ACCOUNT like  CONCAT('%',CONCAT(#{account},'%'))
         </if>
         <if test="roleName !='' and roleName !=null">
             and NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
         </if>
+
     </select>
 
     <select id="getUserCount"  resultType="java.lang.Long">