diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 0bc25d5ccd..fced7a9aeb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -409,9 +409,9 @@ public class IcResiUserController { * @date 2021/11/3 1:42 下午 */ @PostMapping("searchbyname") - public Result> searchByName(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { + public Result> searchByName(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) { ValidatorUtils.validateEntity(formDTO, SearchByNameFormDTO.SearchByNameForm.class); - return new Result>().ok(icResiUserService.searchByName(formDTO, tokenDto)); + return new Result>().ok(icResiUserService.searchByName(formDTO, tokenDto)); } @NotNull diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 478ab8f65f..e328c556d4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -99,7 +99,7 @@ public interface IcResiUserService extends BaseService { * @author zxc * @date 2021/11/3 1:42 下午 */ - List searchByName(SearchByNameFormDTO formDTO,TokenDto tokenDto); + PageData searchByName(SearchByNameFormDTO formDTO, TokenDto tokenDto); /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 351c5058b3..daa3526570 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -570,7 +570,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl searchByName(SearchByNameFormDTO formDTO, TokenDto tokenDto) { + public PageData searchByName(SearchByNameFormDTO formDTO, TokenDto tokenDto) { // 查询工作人员所属组织 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo){ @@ -580,7 +580,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.searchByName(formDTO.getName(), staffInfo.getAgencyId(), no)); List result = pageInfo.getList(); if (CollectionUtils.isEmpty(result)){ - return new ArrayList<>(); + return new PageData<>(new ArrayList<>(), pageInfo.getTotal()); } // 查询小区,楼号,网格 Result> gridResult = govOrgOpenFeignClient.getGridListByGridIds(result.stream().map(SearchByNameResultDTO::getGridId).collect(Collectors.toList())); @@ -605,7 +605,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(result, pageInfo.getTotal()); } /**