个人中心 我参与的话题 增加组Id返参

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -740,13 +740,4 @@ public class DemoController {
         log.info("影响行数="+updateNum);
         return new Result();
     }
-
-    @Autowired
-    private ScreenGrassrootsGovernDataAbsorptionService wc;
-
-    @PostMapping("wc")
-    public Result wc(@RequestBody ScreenCentralZoneDataFormDTO param){
-        wc.difficultyDataHub(param);
-        return new Result();
-    }
 }

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

@@ -16,6 +16,8 @@ public class ParticipatedTopicUnitResultDTO implements Serializable {
 
     private String topicId;
 
+    private String groupId;
+
     private String topicReleaseGridName;
 
     private String topicContent;

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

@@ -482,8 +482,8 @@
         topic.topic_content,
         UNIX_TIMESTAMP(topic.created_time) AS releaseTime,
         groupp.group_name AS topicReleaseGroupName,
-        groupp.grid_id AS topicReleaseGridName
-
+        groupp.grid_id AS topicReleaseGridName,
+        topic.GROUP_ID
         FROM
         resi_topic topic LEFT JOIN resi_group groupp ON topic.group_id = groupp.ID AND groupp.del_flag = '0' AND groupp.customer_id = #{customerId}
         WHERE