From 6db9220082dddc47df51e95c5c9b7522b5761306 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 13 Dec 2021 17:49:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/sys/controller/UserEOController.java    | 4 ++--
 adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java  | 2 +-
 .../src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java   | 2 ++
 .../main/java/com/adc/da/sys/service/IUserEOService.java    | 2 +-
 .../java/com/adc/da/sys/service/impl/UserEOServiceImpl.java | 4 ++--
 .../src/main/resources/mybatis/mapper/sys/UserEOMapper.xml  | 6 ++++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
index 909c6720..377c6226 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java
@@ -72,8 +72,8 @@ public class UserEOController extends BaseController<UserEO> {
     @ApiOperation(value = "|UserEO|详情")
     @GetMapping("/getUserByPhone")
 //	@RequiresPermissions("sys:user:get")
-    public ResponseMessage<List<UserPhoneDTO>> getUserByName(@RequestParam(required = false,value = "name")String name){
-        List<UserPhoneDTO> userPhoneDTOS=userEOService.getUserByName(name);
+    public ResponseMessage<List<UserPhoneDTO>> getUserByName(@RequestParam(required = false,value = "name")String name,@RequestParam("page")Integer page){
+        List<UserPhoneDTO> userPhoneDTOS=userEOService.getUserByName(name,page);
         return Result.success(userPhoneDTOS);
     }
 
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
index feb6b27f..8e80deae 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java
@@ -173,6 +173,6 @@ public interface UserEODao extends BaseMapper<UserEO> {
 	public UserEO getUserEOByAccountNotDeleted(String account);
 
 	//手机端接口 只查人
-	List<UserPhoneDTO> getUserByName(@Param("name") String name);
+	List<UserPhoneDTO> getUserByName(@Param("name") String name,@Param("page")Integer page);
 
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java
index b7e6e3b4..8c416903 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserPhoneDTO.java
@@ -9,5 +9,7 @@ public class UserPhoneDTO {
 
     private String userName;
 
+    private Integer total;
+
 
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
index 2ac157e6..73a74e01 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java
@@ -77,7 +77,7 @@ public interface IUserEOService extends IService<UserEO> {
     public UserEO getUserByLoginNameNotDeleted(String userName);
 
     //手机端接口 只查人
-    List<UserPhoneDTO> getUserByName(String name);
+    List<UserPhoneDTO> getUserByName(String name,Integer page);
 
 
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
index 2f8b0bec..d3265e76 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java
@@ -512,8 +512,8 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
 	}
 
     @Override
-    public List<UserPhoneDTO> getUserByName(String name) {
-        return this.baseMapper.getUserByName(name);
+    public List<UserPhoneDTO> getUserByName(String name,Integer page) {
+        return this.baseMapper.getUserByName(name,page);
     }
 
 }
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index d3ccac97..240dcca8 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -794,13 +794,15 @@
     </select>
 
     <select id="getUserByName" resultType="com.adc.da.sys.entity.UserPhoneDTO">
-        select USID as usId ,concat( UNAME,concat(concat('(',ts_user.USID),')')) as userName from ts_user
+        select USID as usId ,concat( UNAME,concat(concat('(',ts_user.USID),')')) as userName ,
+        (select count(USID) from ts_user ) as total
+        from ts_user
         where 1=1
         <if test="name != null and name != '' ">
             ts_user.UNAME like  concat(concat('%',#{name}),'%') or
             ts_user.USID like  concat(concat('%',#{name}),'%')
         </if>
-
+        limit ${(page-1)*20},${page*20}
     </select>
 
 </mapper>