From 30c2b5de44847035b06a564bd525bd8d0ed574d1 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 26 Sep 2021 10:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86-=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E7=AE=A1=E7=90=86=20=E8=BE=93=E5=85=A5=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=20=E6=9F=A5=E8=AF=A2=20=E6=9C=8912?=
 =?UTF-8?q?=E6=9D=A1=20=E4=BD=86=E6=98=AF=E6=98=BE=E7=A4=BA25=E6=9D=A1=202?=
 =?UTF-8?q?5=E6=9D=A1=E6=98=AF=E6=89=80=E6=9C=89=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java | 2 +-
 .../main/resources/mybatis/mapper/sarUser/TsUserMapper.xml  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
index 900ec013..d23b2b4b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
@@ -70,7 +70,7 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
         Page<TsUser> tsUserPage = new Page<>();
         System.out.println(tsUser.getCurrent());
         System.out.println(tsUser.getSize());
-        List<TsUser> tsUserList =  tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),1*tsUser.getSize(),tsUser);
+        List<TsUser> tsUserList =  tsUserDao.getUserAndPositionPage((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser);
         Integer total = tsUserDao.getUserAndPositionCount(tsUser);
         tsUserPage.setRecords(tsUserList);
         tsUserPage.setCurrent(tsUser.getCurrent());
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 6c5a5869..5346819e 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
@@ -51,6 +51,12 @@
         left join ts_position p
         on up.position_id=p.id
         where u.institution_id=#{TsUser.institutionId}
+        <if test="TsUser.uname != null and TsUser.uname != '' ">
+            and u.uname like concat('%',#{TsUser.uname},'%')
+        </if>
+        <if test="TsUser.email != null and TsUser.email != '' ">
+            and u.email like concat('%',#{TsUser.email},'%')
+        </if>
     </select>
 
     <select id="getUserIdsByPositionIds" resultType="String">