From 41b1e7d345dde19adf0c4e3a0313686d0e08f40b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 11 Nov 2020 14:17:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/MyPartProjectsResultDTO.java    | 4 ++--
 .../topic/service/impl/ResiTopicCommentServiceImpl.java       | 1 +
 .../src/main/resources/mapper/topic/ResiTopicDao.xml          | 4 ++--
 .../com/epmet/modules/person/controller/IssueController.java  | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

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<ResiTopicCommen
     @Autowired
     ResiGroupMemberDao resiGroupMemberDao;
 
+    @Autowired
     ResiTopicDao resiTopicdDao;
 
     @Value("${openapi.scan.server.url}")
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index a735f0f565..cf570c9eda 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -460,8 +460,8 @@
 
     <select id="selectIssueList" resultType="com.epmet.resi.group.dto.topic.result.IssueGridResultDTO">
         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<List<MyPartProjectsResultDTO>> myPartProjects(@RequestBody MyPartProjectsFormDTO formDTO) {
+    public Result<List<MyPartProjectsResultDTO>> myPartProjects(@LoginUser TokenDto tokenDTO, @RequestBody MyPartProjectsFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MyPartProjectsFormDTO.MyProject.class);
-        formDTO.setUserId(loginUserUtil.getLoginUserId());
+        formDTO.setUserId(tokenDTO.getUserId());
         return new Result<List<MyPartProjectsResultDTO>>().ok(issueService.myPartProjects(formDTO));
     }