Merge branch 'dev_personal_center' into dev_temp

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;
 }

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}")

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

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));
     }