From adddb5759e02f04906168808e895763ffa5b1ca4 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 30 Aug 2022 18:07:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/sarUser/TsUserMapper.xml    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
index d68b67e8..71022ed0 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
@@ -49,7 +49,10 @@
     </select>
 
     <select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
-        select u.*,p.id p_id,p.name p_name from ts_user u
+        select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
+               ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
+             ,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,
+               min(p.id) p_id,min(p.name) p_name from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p
@@ -67,13 +70,15 @@
                 #{id}
             </foreach>
         </if>
+        group by u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
+        ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
+        ,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID
         <if test=" null != ids and ids.size()> 0">
         order by field(INSTITUTION_ID,
             <foreach item="id" collection="ids" open="" separator="," close="" index="index">
                 #{id}
             </foreach>)
         </if>
---         order by u.CREATION_TIME desc,u.USID
         limit #{start},#{end}
     </select>
 

From c4f23a11ac9bf9e9c0e1c58bacf2beb7812998b2 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 30 Aug 2022 18:11:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
index 71022ed0..15d29a7f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
@@ -83,7 +83,7 @@
     </select>
 
     <select id="userUnderInstitutionCount" resultType="java.lang.Integer">
-        select count(u.USID) from ts_user u
+        select count(distinct u.USID) from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p