From 791871f34afbb098c67bc8bc467420f122af40fc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 18 Mar 2022 20:33:24 +0800 Subject: [PATCH] list --- .../java/com/epmet/dto/result/CollectListResultDTO.java | 1 + .../java/com/epmet/controller/IcResiCollectController.java | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index dc981a1b02..c9c45c0dba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -22,6 +22,7 @@ public class CollectListResultDTO implements Serializable { */ private String houseHolderName; + @JsonIgnore private String id; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java index c6bdb897ed..ed1227c01e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectController.java @@ -61,11 +61,10 @@ public class IcResiCollectController { * @date 2022/3/18 19:23 */ @PostMapping("list") -// public Result> getCollectList(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto){ - public Result> getCollectList(@RequestBody CollectListFormDTO formDTO){ + public Result> getCollectList(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(formDTO,CollectListFormDTO.CollectListForm.class); - formDTO.setUserId("ebcef7c1c63a87a226e59f1e0149d331"); - formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icResiCollectService.getCollectList(formDTO)); }