diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
index f0c689c875..8a55f6c7a9 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java
@@ -31,6 +31,7 @@ public interface NumConstant {
     int FORTY = 40;
     int FIFTY = 50;
     int ONE_HUNDRED = 100;
+    int MAX = 99999999;
 
     long ZERO_L = 0L;
     long ONE_L = 1L;
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java
new file mode 100644
index 0000000000..b48456f0cb
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/form/AuditingPartyMemberFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 党员认证-待审核列表入参
+ * @Author yinzuomei
+ * @Date 2020/4/26 15:59
+ */
+@Data
+public class AuditingPartyMemberFormDTO implements Serializable {
+    private static final long serialVersionUID = 6022180109189321760L;
+
+    /**
+     * 网格ID
+     */
+    @NotBlank(message = "网格id不能为空")
+    private String gridId;
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
new file mode 100644
index 0000000000..83b2fa05ca
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java
@@ -0,0 +1,36 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AuditingPartyMemberFormDTO;
+import com.epmet.service.ResiPartyMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 基层治理-党员认证
+ * @Author yinzuomei
+ * @Date 2020/4/26 14:01
+ */
+@RestController
+@RequestMapping("partymember")
+public class ResiPartyMemberController {
+    @Autowired
+    private ResiPartyMemberService resiPartyMemberService;
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 待审核列表:自动审核失败且已经录入了补充信息的
+     * @Date 2020/4/26 16:04
+     **/
+    @PostMapping("auditing")
+    public Result auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) {
+        return resiPartyMemberService.auditing(formDTO);
+    }
+}
+
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
new file mode 100644
index 0000000000..e2eed38422
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java
@@ -0,0 +1,85 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
+import com.epmet.service.ResiTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("resi/topic")
+public class ResiTopicController {
+    @Autowired
+    private ResiTopicService resiTopicService;
+
+    /**
+     * @Description 政府端群组管理-屏蔽话题列表查询
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return List<ResiTopicInfoResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 16:45
+     **/
+    @PostMapping("hiddenlist")
+    Result<List<ResiTopicInfoResultDTO>> hiddenList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+        ValidatorUtils.validateEntity(topicPageFormDTO);
+        return resiTopicService.hiddenList(topicPageFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选)
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
+    @PostMapping("alltopics")
+    Result<List<ResiTopicInfoResultDTO>> allTopics(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+        ValidatorUtils.validateEntity(topicPageFormDTO);
+        return resiTopicService.allTopics(topicPageFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-获取话题详情
+     * @Param tokenDto
+     * @Param String
+     * @return Result<ResiTopicDetailResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 23:48
+     **/
+    @PostMapping("topicdetail")
+    Result<ResiTopicDetailResultDTO> getTopicDetailGov(@LoginUser TokenDto tokenDto,@RequestBody ResiTopicDetailFormDTO topicDetailFormDTO){
+        ValidatorUtils.validateEntity(topicDetailFormDTO);
+        return resiTopicService.topicDetail(topicDetailFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-获取某个话题的评论列表
+     * @Param tokenDto
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 23:49
+     **/
+    @PostMapping("topiccomments")
+    Result<List<ResiCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto,@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
+        ValidatorUtils.validateEntity(queryCommentFormDTO);
+        return resiTopicService.topicComments(queryCommentFormDTO);
+    }
+
+
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
index 346f0d86d8..2978f72a86 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
@@ -3,6 +3,8 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.fallback.ResiGroupFeignClientFallBack;
+import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
 import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
 import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
 import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO;
@@ -11,8 +13,13 @@ import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -90,5 +97,48 @@ public interface ResiGroupFeignClient {
 	@PostMapping("/resi/group/group/disagreeapplying")
 	Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
 
+	/**
+	 * @Description 政府端群组管理-屏蔽话题列表查询
+	 * @Param tokenDto
+	 * @Param ResiTopicPageFormDTO.class
+	 * @return List<ResiTopicInfoResultDTO>
+	 * @Author wangc
+	 * @Date 2020.04.01 16:45
+	 **/
+	@PostMapping("/resi/group/topic/gethiddentopicgov")
+	Result<List<ResiTopicInfoResultDTO>> getHiddenTopicGov(ResiTopicPageFormDTO topicPageFormDTO);
+
+	/**
+	 * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选)
+	 * @Param tokenDto
+	 * @Param ResiTopicPageFormDTO.class
+	 * @return Result<List<ResiTopicInfoResultDTO>>
+	 * @Author wangc
+	 * @Date 2020.04.01 10:36
+	 **/
+	@PostMapping("/resi/group/topic/getpasttopiclistgov")
+	Result<List<ResiTopicInfoResultDTO>> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO);
+
+	/**
+	 * @Description 政府端群组管理-获取话题详情
+	 * @Param tokenDto
+	 * @Param String
+	 * @return Result<ResiTopicDetailResultDTO>
+	 * @Author wangc
+	 * @Date 2020.04.01 23:48
+	 **/
+	@PostMapping("/resi/group/topic/gettopicdetailgov")
+	Result<ResiTopicDetailResultDTO> getTopicDetailGov(ResiTopicDetailFormDTO topicDetailFormDTO);
+
+	/**
+	 * @Description 政府端群组管理-获取某个话题的评论列表
+	 * @Param tokenDto
+	 * @Param ResiQueryCommentFormDTO
+	 * @return Result<List<ResiCommentResultDTO>>
+	 * @Author wangc
+	 * @Date 2020.04.01 23:49
+	 **/
+	@PostMapping("/resi/group/comment/getcommentlistoftopicgov")
+	Result<List<ResiCommentResultDTO>> getCommentListOfTopicGov(ResiQueryCommentFormDTO queryCommentFormDTO);
 
-}
+	}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
index 8fab3c64bd..8cae519fd5 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
@@ -4,6 +4,8 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
 import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
 import com.epmet.resi.group.dto.group.form.GroupAuditedFromDTO;
 import com.epmet.resi.group.dto.group.result.GovGroupSummarizeResultDTO;
@@ -12,6 +14,10 @@ import com.epmet.resi.group.dto.group.result.ApplyingGroupDetailResultDTO;
 import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupAuditedResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupsInGridResultDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -85,4 +91,24 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
 	public Result disagreeApplying(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "disagreeApplying", disAgreeApplyGroupFormDTO);
 	}
+
+	@Override
+	public Result<List<ResiTopicInfoResultDTO>> getHiddenTopicGov(ResiTopicPageFormDTO topicPageFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getHiddenTopicGov", topicPageFormDTO);
+	}
+
+	@Override
+	public Result<List<ResiTopicInfoResultDTO>> getPastTopicListGov(ResiTopicPageFormDTO topicPageFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getPastTopicListGov", topicPageFormDTO);
+	}
+
+	@Override
+	public Result<ResiTopicDetailResultDTO> getTopicDetailGov(ResiTopicDetailFormDTO topicDetailFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicDetailGov", topicDetailFormDTO);
+	}
+
+	@Override
+	public Result<List<ResiCommentResultDTO>> getCommentListOfTopicGov(ResiQueryCommentFormDTO queryCommentFormDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getCommentListOfTopicGov", queryCommentFormDTO);
+	}
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
new file mode 100644
index 0000000000..1a28cd0f2e
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
@@ -0,0 +1,20 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AuditingPartyMemberFormDTO;
+
+/**
+ * @Description 基层治理-党员认证
+ * @Author yinzuomei
+ * @Date 2020/4/26 16:02
+ */
+public interface ResiPartyMemberService {
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 待审核列表
+     * @Date 2020/4/26 16:04
+     **/
+    Result auditing(AuditingPartyMemberFormDTO formDTO);
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java
new file mode 100644
index 0000000000..af003cd5a4
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiTopicService.java
@@ -0,0 +1,57 @@
+package com.epmet.service;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+public interface ResiTopicService {
+
+    /**
+     * @Description 政府端群组管理-屏蔽话题列表查询
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return List<ResiTopicInfoResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 16:45
+     **/
+    Result<List<ResiTopicInfoResultDTO>> hiddenList(ResiTopicPageFormDTO topicPageFormDTO);
+
+    /**
+     * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选)
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
+    Result<List<ResiTopicInfoResultDTO>> allTopics(ResiTopicPageFormDTO topicPageFormDTO);
+
+    /**
+     * @Description 政府端群组管理-获取话题详情
+     * @Param tokenDto
+     * @Param String
+     * @return Result<ResiTopicDetailResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 23:48
+     **/
+    Result<ResiTopicDetailResultDTO> topicDetail(ResiTopicDetailFormDTO topicDetailFormDTO);
+
+    /**
+     * @Description 政府端群组管理-获取某个话题的评论列表
+	 * @Param tokenDto
+	 * @Param ResiQueryCommentFormDTO
+	 * @return Result<List<ResiCommentResultDTO>>
+	 * @Author wangc
+	 * @Date 2020.04.01 23:49
+     **/
+    Result<List<ResiCommentResultDTO>> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO);
+
+
+}
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
new file mode 100644
index 0000000000..3cacef6577
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java
@@ -0,0 +1,24 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.AuditingPartyMemberFormDTO;
+import com.epmet.service.ResiPartyMemberService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 基层治理-党员认证
+ * @Author yinzuomei
+ * @Date 2020/4/26 16:02
+ */
+@Service
+public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public Result auditing(AuditingPartyMemberFormDTO formDTO) {
+        return null;
+    }
+}
+
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
new file mode 100644
index 0000000000..b07c045e22
--- /dev/null
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java
@@ -0,0 +1,79 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResiGroupFeignClient;
+import com.epmet.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.ResiCommentResultDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicDetailFormDTO;
+import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
+import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
+import com.epmet.service.ResiTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ResiTopicServiceImpl implements ResiTopicService {
+
+    @Autowired
+    private ResiGroupFeignClient resiGroupFeignClient;
+
+    /**
+     * @Description 政府端群组管理-屏蔽话题列表查询
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return List<ResiTopicInfoResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 16:45
+     **/
+    @Override
+    public Result<List<ResiTopicInfoResultDTO>> hiddenList(ResiTopicPageFormDTO topicPageFormDTO) {
+        topicPageFormDTO.setPageNo(NumConstant.ONE);
+        topicPageFormDTO.setPageSize(NumConstant.MAX);
+        return resiGroupFeignClient.getHiddenTopicGov(topicPageFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选)
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
+    @Override
+    public Result<List<ResiTopicInfoResultDTO>> allTopics(ResiTopicPageFormDTO topicPageFormDTO) {
+        topicPageFormDTO.setPageNo(NumConstant.ONE);
+        topicPageFormDTO.setPageSize(NumConstant.MAX);
+        return resiGroupFeignClient.getPastTopicListGov(topicPageFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-获取话题详情
+     * @Param tokenDto
+     * @Param String
+     * @return Result<ResiTopicDetailResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 23:48
+     **/
+    @Override
+    public Result<ResiTopicDetailResultDTO> topicDetail(ResiTopicDetailFormDTO topicDetailFormDTO) {
+        return resiGroupFeignClient.getTopicDetailGov(topicDetailFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-获取某个话题的评论列表
+     * @Param tokenDto
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 23:49
+     **/
+    @Override
+    public Result<List<ResiCommentResultDTO>> topicComments(ResiQueryCommentFormDTO queryCommentFormDTO) {
+        return resiGroupFeignClient.getCommentListOfTopicGov(queryCommentFormDTO);
+    }
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java
index 321069290b..bbb8188665 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java
@@ -56,4 +56,18 @@ public class ResiCommentController {
         ValidatorUtils.validateEntity(queryCommentFormDTO);
         return commentService.getCommentList(tokenDto,queryCommentFormDTO);
     }
+
+    /**
+     * @Description 政府端群组管理-获取某个话题的评论列表
+     * @Param tokenDto
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 23:49
+     **/
+    @PostMapping("getcommentlistoftopicgov")
+    public Result<List<ResiCommentResultDTO>> getCommentListOfTopicGov(@RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
+        ValidatorUtils.validateEntity(queryCommentFormDTO);
+        return commentService.getCommentList(null,queryCommentFormDTO);
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index b8dba5abcc..3114599050 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -82,7 +82,7 @@ public class ResiTopicController {
      * @Date 2020.04.02 00:01
      **/
     @PostMapping("getlatesttopics")
-    Result<List<ResiTopicInfoResultDTO>> getLatestTopics(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
+    public Result<List<ResiTopicInfoResultDTO>> getLatestTopics(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
         ValidatorUtils.validateEntity(topicDefaultPageFormDTO);
         return topicService.getLatestTopics(tokenDto,topicDefaultPageFormDTO.getGroupId());
     }
@@ -141,4 +141,46 @@ public class ResiTopicController {
         ValidatorUtils.validateEntity(closeFormDTO);
         return topicService.closeTopic(tokenDto,closeFormDTO);
     }
+
+    /**
+     * @Description 政府端群组管理-屏蔽话题列表查询
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return List<ResiTopicInfoResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 16:45
+     **/
+    @PostMapping("gethiddentopicgov")
+    public Result<List<ResiTopicInfoResultDTO>> getHiddenTopicGov(@RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+        ValidatorUtils.validateEntity(topicPageFormDTO);
+        return topicService.getHiddenTopics(null,topicPageFormDTO);
+    }
+
+    /**
+     * @Description 政府端群组管理-查看历史话题(分页,允许状态筛选)
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
+    @PostMapping("getpasttopiclistgov")
+    public Result<List<ResiTopicInfoResultDTO>> getPastTopicListGov(@RequestBody ResiTopicPageFormDTO topicPageFormDTO){
+        ValidatorUtils.validateEntity(topicPageFormDTO);
+        return topicService.getPastTopicList(null,topicPageFormDTO);
+    }
+    /**
+     * @Description 政府端群组管理-获取话题详情
+     * @Param tokenDto
+     * @Param String
+     * @return Result<ResiTopicDetailResultDTO>
+     * @Author wangc
+     * @Date 2020.04.01 23:48
+     **/
+    @PostMapping("gettopicdetailgov")
+    public Result<ResiTopicDetailResultDTO> getTopicDetailGov( @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
+        ValidatorUtils.validateEntity(topicDetailFormDTO);
+        return topicService.getTopicDetail(null,topicDetailFormDTO.getTopicId());
+    }
+
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index c4af44761f..a1303453ba 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -545,36 +545,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
             resultDTO.setReleaseUserName(memberRedis.getUserShowName());
             resultDTO.setReleaseUserHeadPhoto(memberRedis.getUserHeadPhoto());
-        }else{
-            logger.warn(ModuleConstant.GROUP_MEMBER_NOT_EXISTS_IN_CACHE);
-
-            UserResiInfoFormDTO userParam = new UserResiInfoFormDTO();
-            userParam.setUserId(topic.getCreatedBy());
-            userParam.setCustomerId(group.getCustomerId());
-            Result<UserResiInfoResultDTO> userInfo =  epmetUserFeignClient.getUserResiInfoDTO(userParam);
-            if(userInfo.success()){
-                if(null != userInfo.getData()){
-                    resultDTO.setReleaseUserName(userInfo.getData().getShowName());
-                    resultDTO.setReleaseUserHeadPhoto(userInfo.getData().getHeadPhoto());
-
-                    ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
-                    ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(group.getId(), userInfo.getData().getUserId());
-
-                    memberRedisDTO.setUserId(userInfo.getData().getUserId());
-                    memberRedisDTO.setUserHeadPhoto(userInfo.getData().getHeadPhoto());
-                    memberRedisDTO.setUserShowName(userInfo.getData().getShowName());
-
-                    memberRedisDTO.setEnterGroupType(memberMySql.getEnterGroupType());
-                    memberRedisDTO.setGroupLeaderFlag(memberMySql.getGroupLeaderFlag());
-                    memberRedisDTO.setMemberStatus(memberMySql.getStatus());
-
-                    memberRedisDTO.setGroupId(group.getId());
-                    resiGroupMemberRedis.set(memberRedisDTO);
-                }
-
-            }else{
-                logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);
-            }
         }
 
         return new Result<ResiTopicDetailResultDTO>().ok(resultDTO);
@@ -601,16 +571,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
         //2.遍历用户信息
         if (null != hiddenTopics && hiddenTopics.size() > 0) {
-
-            /*List<String> userIdList = new ArrayList<>();
-            for (ResiTopicInfoResultDTO topic : hiddenTopics) {
-                userIdList.add(topic.getUserId());
-            }
-            UserResiInfoListFormDTO formDTO = new UserResiInfoListFormDTO();
-            formDTO.setUserIdList(userIdList);
-            Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult = epmetUserFeignClient.getUserResiInfoList(formDTO);
-            setUserInfo(userResiInfoDTOListResult, hiddenTopics);*/
-
             setCacheUserInfo(topicPageFormDTO.getGroupId(), hiddenTopics);
         }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql
index a60097daac..a20663b2ce 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/redis/migration/db.sql
@@ -2,4 +2,6 @@
 ALTER TABLE resi_warmhearted_apply ADD (
 	READ_FLAG VARCHAR (255) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)',
 	MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容'
-);
\ No newline at end of file
+);
+-- 修改党员认证结果2020-04-26
+alter table partymember_info modify column CONFIRM_RESULT varchar(20) COMMENT '认证结果:auto_confirm_success:自动认证成功,auto_confirm_failed:自动认证失败,approved:人工审核通过，rejected :拒绝)';
\ No newline at end of file