From 460892ce487ebf68c4b8f08ea71c3c7b4eb186c0 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 30 Aug 2022 18:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=94=B9=E5=9B=9E?=
 =?UTF-8?q?=E5=8E=9F=E7=8A=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarUser/TsUserMapper.xml     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 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 15d29a7f..a9d22eda 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,10 +49,7 @@
     </select>
 
     <select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
-        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
+        select u.*,p.id p_id,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
@@ -70,20 +67,12 @@
                 #{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>
 
     <select id="userUnderInstitutionCount" resultType="java.lang.Integer">
-        select count(distinct u.USID) from ts_user u
+        select count(u.USID) from ts_user u
         left join ts_user_position up
         on u.usid=up.user_id
         left join ts_position p