修改：我发表的话题-已转议题，我发表的话题-已转项目修改，增加议题id，用于前端跳转到详情

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectOfCreateTopicUserResultDTO.java

@@ -9,6 +9,7 @@ public class ProjectOfCreateTopicUserResultDTO {
 
     private String topicId;
     private String projectId;
+    private String issueId;
     private String gridId;
     private Long shiftProjectTime;
     private List<String> departmentNameList;

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -234,13 +234,15 @@
             p.id as projectId,
             rp.GRID_ID gridId,
             p.TITLE as projectTitle,
-            rp.GRID_ID releaseGridId
+            rp.GRID_ID releaseGridId,
+            rp2.SOURCE_ID  as issueId
         from project_related_personnel rp
                  inner join project p on (rp.PROJECT_ID = p.ID and p.DEL_FLAG = 0)
-        where USER_ID = #{userId}
+                 left join project_related_personnel rp2 on (rp.PROJECT_ID = rp2.PROJECT_ID and rp2.SOURCE_TYPE = 'issue')
+        where rp.USER_ID = #{userId}
             and p.CUSTOMER_ID=#{customerId}
             and p.DEL_FLAG=0
-            and SOURCE_TYPE = 'topic'
+            and rp.SOURCE_TYPE = 'topic'
         order by p.CREATED_TIME desc
     </select>
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/MyCreateTopicsResultDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 public class MyCreateTopicsResultDTO {
 
     private String topicId;
+    private String groupId;
     private Long releaseTime;
     private String topicContent;
     private String releaseGroupName;

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -452,7 +452,8 @@
                t.topic_content as topicContent,
                unix_timestamp(t.created_time) as releaseTime,
                g.GROUP_NAME    as releaseGroupName,
-               g.GRID_ID       as releaseGridId
+               g.GRID_ID       as releaseGridId,
+               t.GROUP_ID      as groupId
         from resi_topic t
                  inner join resi_group g on (t.GROUP_ID = g.ID and g.CUSTOMER_ID = #{customerId})
         where t.CREATED_BY = #{userId}

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyCreateTopicsResultDTO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 @Data
 public class MyCreateTopicsResultDTO {
     private String topicId;
+    private String groupId;
     private Long releaseTime;
     private String topicContent;
     private String releaseGroupName;

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyShiftProjectTopicsResultDTO.java

@@ -8,6 +8,7 @@ import java.util.List;
 public class MyShiftProjectTopicsResultDTO {
     private String topicId;
     private String gridId;
+    private String issueId;
     private Long shiftProjectTime;
     private List<String> departmentNameList;
     private String projectTitle;