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 { @ApiOperation(value = "|UserEO|详情") @GetMapping("/getUserByPhone") // @RequiresPermissions("sys:user:get") - public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name){ - List userPhoneDTOS=userEOService.getUserByName(name); + public ResponseMessage> getUserByName(@RequestParam(required = false,value = "name")String name,@RequestParam("page")Integer page){ + List 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 { public UserEO getUserEOByAccountNotDeleted(String account); //手机端接口 只查人 - List getUserByName(@Param("name") String name); + List 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 { public UserEO getUserByLoginNameNotDeleted(String userName); //手机端接口 只查人 - List getUserByName(String name); + List 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 implements } @Override - public List getUserByName(String name) { - return this.baseMapper.getUserByName(name); + public List 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 @@