diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java index 6375992bab..b5e41d64a5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyPartProjectsResultDTO.java @@ -43,11 +43,11 @@ public class MyPartProjectsResultDTO implements Serializable { /** * 议题Id,用户数据整合使用(项目出自哪个网格"组织-网格") */ - @JsonIgnore + //@JsonIgnore private String issueId; /** * 项目状态(待处理 pending,结案closed)用于查询当前处理部门信息 */ - @JsonIgnore + //@JsonIgnore private String status; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java index 6f3b1557d3..a4e0365d2a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java @@ -97,6 +97,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl SELECT - rt.issue_id AS "gridId", - rg.grid_id AS "issueId" + rt.issue_id AS "issueId", + rg.grid_id AS "gridId" FROM resi_topic rt INNER JOIN resi_group rg ON rt.group_id = rg.id diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java index ae2ef2eff6..6479c87583 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java @@ -46,9 +46,9 @@ public class IssueController { * @author sun */ @PostMapping("my-part-projects") - public Result> myPartProjects(@RequestBody MyPartProjectsFormDTO formDTO) { + public Result> myPartProjects(@LoginUser TokenDto tokenDTO, @RequestBody MyPartProjectsFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, MyPartProjectsFormDTO.MyProject.class); - formDTO.setUserId(loginUserUtil.getLoginUserId()); + formDTO.setUserId(tokenDTO.getUserId()); return new Result>().ok(issueService.myPartProjects(formDTO)); }