list

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;
 
     /**

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<PageData<CollectListResultDTO>> getCollectList(@RequestBody CollectListFormDTO formDTO, @LoginUser TokenDto tokenDto){
-    public Result<PageData<CollectListResultDTO>> getCollectList(@RequestBody CollectListFormDTO formDTO){
+    public Result<PageData<CollectListResultDTO>> 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<PageData<CollectListResultDTO>>().ok(icResiCollectService.getCollectList(formDTO));
     }