diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java index 2a12e788b7..3ad39e8ffb 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordMaritalPageFormDTO.java @@ -29,5 +29,7 @@ public class DataSyncRecordMaritalPageFormDTO extends PageFormDTO { * 当前工作人员所属组织id */ private String agencyId; + + private String userId; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java index b07eae992b..82ad71b4c0 100755 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/DataSyncRecordMaritalPageResultDTO.java @@ -63,7 +63,7 @@ public class DataSyncRecordMaritalPageResultDTO implements Serializable { */ private Integer dealStatus; - private Integer dealStatusName; + private String dealStatusName; /** * 处理结果 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java index 045f211439..fd280ba2be 100755 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordMaritalController.java @@ -39,7 +39,7 @@ public class DataSyncRecordMaritalController { @PostMapping("page") public Result> page(@LoginUser TokenDto tokenDto, @RequestBody DataSyncRecordMaritalPageFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setCustomerId(tokenDto.getCustomerId());; + formDTO.setUserId(tokenDto.getUserId()); PageData page = dataSyncRecordMaritalService.page(formDTO); return new Result>().ok(page); }