diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java
index 91a5bf4f..a2d17b9c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PartyGroupFeignClient.java
@@ -31,8 +31,8 @@ public interface PartyGroupFeignClient {
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>>
      **/
-    @GetMapping(value = "partyGroup/group/list/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<List<PartyGroupResultDTO>> list(@PathVariable("userId") String userId);
+    @GetMapping(value = "partyGroup/group/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<PartyGroupResultDTO>> list(PartyGroupListFormDTO partyGroupListFormDTO);
 
     /**
      * @Description  网格长列表
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java
index 6f949b9b..f3c15476 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PartyGroupFeignClientFallback.java
@@ -22,8 +22,8 @@ import java.util.List;
 public class PartyGroupFeignClientFallback implements PartyGroupFeignClient {
 
     @Override
-    public Result<List<PartyGroupResultDTO>> list(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "list",userId);
+    public Result<List<PartyGroupResultDTO>> list(PartyGroupListFormDTO partyGroupListFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PARTY_GROUP_SERVER, "list",partyGroupListFormDTO);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
index cde25115..e6156aa9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
@@ -34,7 +34,10 @@ public class PartyGroupServiceImpl implements PartyGroupService {
         if(userDetail==null){
             return new Result<List<PartyGroupResultDTO>>().error("未登录");
         }
-        return partyGroupFeignClient.list(userDetail.getUserId());
+        PartyGroupListFormDTO  partyGroupListFormDTO = new PartyGroupListFormDTO();
+        partyGroupListFormDTO.setUserId(userDetail.getUserId());
+        partyGroupListFormDTO.setGridId(String.valueOf(userDetail.getGridId()));
+        return partyGroupFeignClient.list(partyGroupListFormDTO);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java
index a4229a92..d7724968 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/constant/PartyGroupConstant.java
@@ -20,4 +20,14 @@ public interface PartyGroupConstant {
      */
     String PARTY_GROUP_IDENTITY_FLAG = "0";
 
+
+    /**
+     * 点赞
+     */
+    String TOPIC_SUPPORT = "0";
+    /**
+     * 取消点赞
+     */
+    String TOPIC_CANCEL_SUPPORT = "2";
+
 }
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyGroupListFormDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyGroupListFormDTO.java
new file mode 100644
index 00000000..be73a6ef
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/form/PartyGroupListFormDTO.java
@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author songyunpeng
+ * @Date 2020/6/3 16:24
+ */
+@Data
+public class PartyGroupListFormDTO implements Serializable {
+    private static final long serialVersionUID = -3034807666143092535L;
+
+
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户所在网格ID
+     */
+    private String gridId;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyGroupController.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyGroupController.java
index a4c564bc..78494570 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyGroupController.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/controller/AppPartyGroupController.java
@@ -2,11 +2,15 @@ package com.elink.esua.epdc.controller;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.PartyGroupListFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserJoinGroupFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupResultDTO;
 import com.elink.esua.epdc.service.PartyGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -29,9 +33,9 @@ public class AppPartyGroupController {
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>>
      **/
-    @GetMapping("list/{userId}")
-    public Result<List<PartyGroupResultDTO>> list(@PathVariable("userId") String userId){
-        List<PartyGroupResultDTO> data = partyGroupService.getAllPartyGroup(userId);
+    @GetMapping("list")
+    public Result<List<PartyGroupResultDTO>> list(@RequestBody PartyGroupListFormDTO partyGroupListFormDTO){
+        List<PartyGroupResultDTO> data = partyGroupService.getAllPartyGroup(partyGroupListFormDTO);
         return new Result<List<PartyGroupResultDTO>>().ok(data);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java
index 8c449e9b..3c11779a 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupDao.java
@@ -65,7 +65,7 @@ public interface PartyGroupDao extends BaseDao<PartyGroupEntity> {
      * @Param []
      * @return java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>
      **/
-    List<PartyGroupResultDTO> getAllPartyGroup(String userId);
+    List<PartyGroupResultDTO> getAllPartyGroup(String userId,String streetId);
     /**
      * @Description  根据党群名获取党群
      * @Author songyunpeng
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java
index 0ccc59fd..4329330a 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyGroupOfficialsDao.java
@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyGroupOfficialsDTO;
 import com.elink.esua.epdc.dto.form.PartyGroupOfficialsFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupOfficialsResultDTO;
 import com.elink.esua.epdc.entity.PartyGroupOfficialsEntity;
@@ -41,7 +42,7 @@ public interface PartyGroupOfficialsDao extends BaseDao<PartyGroupOfficialsEntit
      * @Param [params]
      * @return java.util.List<com.elink.esua.epdc.dto.PartyGroupOfficialsDTO>
      **/
-    List<PartyGroupOfficialsEntity> selectListOfPartyGroupOfficialsDTO(Map<String, Object> params);
+    List<PartyGroupOfficialsDTO> selectListOfPartyGroupOfficialsDTO(Map<String, Object> params);
     /**
      * @Description   官小带个长 接口
      * @Author songyunpeng
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java
index d74ee452..7ad1af00 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicDao.java
@@ -68,7 +68,7 @@ public interface PartyTopicDao extends BaseDao<PartyTopicEntity> {
      * @Param [topicId]
      * @return void
      **/
-    void updateCommentNum(String id);
+    void updateCommentNum(String id, Integer num);
     /**
      * @Description  更新点赞数
      * @Author songyunpeng
@@ -76,5 +76,5 @@ public interface PartyTopicDao extends BaseDao<PartyTopicEntity> {
      * @Param [topicId]
      * @return void
      **/
-    void updateSupportNum(String id);
+    void updateSupportNum(String id,Integer num);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicUserAttitudeDao.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicUserAttitudeDao.java
index 1dad6943..5aef1c18 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicUserAttitudeDao.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyTopicUserAttitudeDao.java
@@ -38,4 +38,12 @@ public interface PartyTopicUserAttitudeDao extends BaseDao<PartyTopicUserAttitud
      * @return com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO
      **/
     PartyTopicUserAttitudeDTO getPartyTopicUserAttitudeDTO(String topicId, String userId);
+    /**
+     * @Description  物理删除
+     * @Author songyunpeng
+     * @Date  2020/6/5
+     * @Param [partyTopicUserAttitudeEntity]
+     * @return void
+     **/
+    Boolean realDelete(PartyTopicUserAttitudeEntity partyTopicUserAttitudeEntity);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
index 36c4da3f..70dc848c 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
@@ -40,10 +40,7 @@ public class PartyGroupOfficialsEntity extends BaseEpdcEntity {
      */
 	private String partyGroupId;
 
-	/**
-     * 党群名
-     */
-	private String partyGroupName;
+
 
     /**
      * 姓名
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java
index fadf55b5..67a632e6 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyGroupService.java
@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PartyGroupDTO;
 import com.elink.esua.epdc.dto.PartyGroupListDTO;
 import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.form.PartyGroupListFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserJoinGroupFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupResultDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
@@ -128,7 +129,7 @@ public interface PartyGroupService extends BaseService<PartyGroupEntity> {
      * @Param []
      * @return java.util.List<com.elink.esua.epdc.dto.result.PartyGroupResultDTO>
      **/
-    List<PartyGroupResultDTO> getAllPartyGroup(String userId);
+    List<PartyGroupResultDTO> getAllPartyGroup(PartyGroupListFormDTO partyGroupListFormDTO);
     /**
      * @Description  加入党群 
      * @Author songyunpeng
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java
index a63451f2..b3bf7fd9 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicService.java
@@ -131,21 +131,21 @@ public interface PartyTopicService extends BaseService<PartyTopicEntity> {
      **/
     Result saveTopic(PartyTopicSubmitFormDTO formDto);
     /**
-     * @Description  评论数+1 
+     * @Description  评论数
      * @Author songyunpeng
      * @Date  2020/6/3
      * @Param [topicId]
      * @return void
      **/
-    void updateCommentNum(String topicId);
+    void updateCommentNum(String topicId,Integer num);
     /**
-     * @Description  点赞+1
+     * @Description  点赞
      * @Author songyunpeng
      * @Date  2020/6/3
      * @Param [topicId]
      * @return void
      **/
-    void updateSupportNum(String topicId);
+    void updateSupportNum(String topicId,Integer num);
     /**
      * @Description  点赞点踩 
      * @Author songyunpeng
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicUserAttitudeService.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicUserAttitudeService.java
index 49a4d1bb..91592c2b 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicUserAttitudeService.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/PartyTopicUserAttitudeService.java
@@ -100,4 +100,12 @@ public interface PartyTopicUserAttitudeService extends BaseService<PartyTopicUse
      * @return com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO
      **/
     PartyTopicUserAttitudeDTO getPartyTopicUserAttitudeDTO(String topicId, String useId);
+    /**
+     * @Description  物理删除 
+     * @Author songyunpeng
+     * @Date  2020/6/5
+     * @Param [partyTopicUserAttitudeEntity]
+     * @return void
+     **/
+    Boolean realDelete(PartyTopicUserAttitudeEntity partyTopicUserAttitudeEntity);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java
index 66166890..4f41c98a 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupOfficialsServiceImpl.java
@@ -42,6 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -89,12 +90,36 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
     @Override
     public PartyGroupOfficialsDTO get(String id) {
         PartyGroupOfficialsEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PartyGroupOfficialsDTO.class);
+        PartyGroupOfficialsDTO partyGroupOfficialsDTO = ConvertUtils.sourceToTarget(entity, PartyGroupOfficialsDTO.class);
+        //取全部部门ID的后三级
+        String[] deptIds = entity.getAllDeptIds().split(",");
+        List<Long> allDeptIdsShow = new ArrayList<>(deptIds.length-1);
+        for(int i = 1;i<deptIds.length;i++){
+            allDeptIdsShow.add(Long.parseLong(deptIds[i]));
+        }
+        partyGroupOfficialsDTO.setAllDeptIdsShow(allDeptIdsShow);
+        return partyGroupOfficialsDTO;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyGroupOfficialsDTO dto) {
+        //处理部门信息
+        this.setDeptInfo(dto);
+        PartyGroupOfficialsEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupOfficialsEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PartyGroupOfficialsDTO dto) {
+        //处理部门信息
+        this.setDeptInfo(dto);
+        PartyGroupOfficialsEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupOfficialsEntity.class);
+        updateById(entity);
+    }
+
+    private void setDeptInfo(PartyGroupOfficialsDTO dto) {
         //处理gridID
         if (dto.getAllDeptIdsShow().size()!= NumConstant.THREE) {
             throw new RenException("请选择网格！");
@@ -117,15 +142,6 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
             dto.setParentDeptIds(deptDTO.getParentDeptIds());
             dto.setParentDeptNames(deptDTO.getParentDeptNames());
         }
-        PartyGroupOfficialsEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupOfficialsEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(PartyGroupOfficialsDTO dto) {
-        PartyGroupOfficialsEntity entity = ConvertUtils.sourceToTarget(dto, PartyGroupOfficialsEntity.class);
-        updateById(entity);
     }
 
     @Override
@@ -140,8 +156,8 @@ public class PartyGroupOfficialsServiceImpl extends BaseServiceImpl<PartyGroupOf
         //赋值当前用户的所在部门
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
         IPage<PartyGroupOfficialsDTO> page = getPage(params);
-        List<PartyGroupOfficialsEntity> list = baseDao.selectListOfPartyGroupOfficialsDTO(params);
-        return new PageData<>(ConvertUtils.sourceToTarget(list,PartyGroupOfficialsDTO.class), page.getTotal());
+        List<PartyGroupOfficialsDTO> list = baseDao.selectListOfPartyGroupOfficialsDTO(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
index 83dfb928..fc4ef054 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyGroupServiceImpl.java
@@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PartyGroupDao;
 import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.form.PartyGroupListFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserJoinGroupFormDTO;
 import com.elink.esua.epdc.dto.result.PartyGroupResultDTO;
 import com.elink.esua.epdc.entity.PartyGroupEntity;
@@ -256,8 +257,16 @@ public class PartyGroupServiceImpl extends BaseServiceImpl<PartyGroupDao, PartyG
     }
 
     @Override
-    public List<PartyGroupResultDTO> getAllPartyGroup(String userId) {
-        return baseDao.getAllPartyGroup(userId);
+    public List<PartyGroupResultDTO> getAllPartyGroup(PartyGroupListFormDTO partyGroupListFormDTO) {
+        //根据网格ID获取街道ID
+        Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(partyGroupListFormDTO.getGridId());
+        if (!parentResult.success() || parentResult.getData() == null) {
+            throw new RenException("获取用户部门信息失败");
+        }
+        ParentAndAllDeptDTO parentAndAllDeptDTO = parentResult.getData();
+        String allDeptIds = parentAndAllDeptDTO.getAllDeptIds();
+        String[] allDeptIdList =  allDeptIds.split(",");
+        return baseDao.getAllPartyGroup(partyGroupListFormDTO.getUserId(),allDeptIdList[1]);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java
index 3444bfd0..82c35d3e 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicCommentServiceImpl.java
@@ -111,6 +111,11 @@ public class PartyTopicCommentServiceImpl extends BaseServiceImpl<PartyTopicComm
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
+        //更新话题评论数
+        PartyTopicCommentDTO partyTopicCommentDTO = get(ids[0]);
+        for(String id : ids){
+            partyTopicService.updateCommentNum(partyTopicCommentDTO.getTopicId(),-1);
+        }
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
@@ -158,7 +163,7 @@ public class PartyTopicCommentServiceImpl extends BaseServiceImpl<PartyTopicComm
             baseDao.updateReplyCount(formDto.getFaCommentId());
         }
         // 评论数加1
-        partyTopicService.updateCommentNum(formDto.getTopicId());
+        partyTopicService.updateCommentNum(formDto.getTopicId(),1);
         return new Result();
     }
 
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
index 6302a11b..857b8ddd 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -30,6 +31,7 @@ import com.elink.esua.epdc.dto.GroupTopicCloseFormDTO;
 import com.elink.esua.epdc.dto.PartyTopicDTO;
 import com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
+import com.elink.esua.epdc.dto.constant.PartyGroupConstant;
 import com.elink.esua.epdc.dto.form.PartyTopicFormDTO;
 import com.elink.esua.epdc.dto.form.PartyTopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.form.TopicStatementFormDTO;
@@ -177,30 +179,45 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
     }
 
     @Override
-    public void updateCommentNum(String topicId) {
-        baseDao.updateCommentNum(topicId);
+    public void updateCommentNum(String topicId,Integer num) {
+        baseDao.updateCommentNum(topicId,num);
     }
 
     @Override
-    public void updateSupportNum(String topicId) {
-        baseDao.updateSupportNum(topicId);
+    public void updateSupportNum(String topicId,Integer num) {
+        baseDao.updateSupportNum(topicId,num);
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void statement(TopicStatementFormDTO formDto) {
-        //防连击！
+        //先根据用户和话题获取点赞点踩表数据
         PartyTopicUserAttitudeDTO partyTopicUserAttitudeDTO = partyTopicUserAttitudeService.getPartyTopicUserAttitudeDTO(formDto.getTopicId(),formDto.getUserId());
-        if(partyTopicUserAttitudeDTO!=null){
-            return;
-        }
-        //插入点赞点踩表
-        PartyTopicUserAttitudeEntity partyTopicUserAttitudeEntity  = new PartyTopicUserAttitudeEntity();
-        partyTopicUserAttitudeEntity.setPartyTopicId(formDto.getTopicId());
-        partyTopicUserAttitudeEntity.setAttitudeFlag(formDto.getAttitude());
-        partyTopicUserAttitudeEntity.setUserId(formDto.getUserId());
-        if(partyTopicUserAttitudeService.insert(partyTopicUserAttitudeEntity)){
-            //更新话题点赞数
-            updateSupportNum(formDto.getTopicId());
+        //判断用户操作
+        if(PartyGroupConstant.TOPIC_SUPPORT.equals(formDto.getAttitude())){//点赞
+            if(partyTopicUserAttitudeDTO!=null){
+                throw new RenException("不能重复点赞");
+            }
+            PartyTopicUserAttitudeEntity partyTopicUserAttitudeEntity  = new PartyTopicUserAttitudeEntity();
+            //插入点赞点踩表
+            partyTopicUserAttitudeEntity.setPartyTopicId(formDto.getTopicId());
+            partyTopicUserAttitudeEntity.setAttitudeFlag(formDto.getAttitude());
+            partyTopicUserAttitudeEntity.setUserId(formDto.getUserId());
+            if(partyTopicUserAttitudeService.insert(partyTopicUserAttitudeEntity)){
+                //更新话题点赞数
+                updateSupportNum(formDto.getTopicId(),1);
+            }
+        }else if(PartyGroupConstant.TOPIC_CANCEL_SUPPORT.equals(formDto.getAttitude())){
+           if(partyTopicUserAttitudeDTO==null){
+               throw new RenException("已取消点赞");
+           }
+           //删除点赞点踩数据
+            PartyTopicUserAttitudeEntity partyTopicUserAttitudeEntity  = new PartyTopicUserAttitudeEntity();
+            partyTopicUserAttitudeEntity.setId(partyTopicUserAttitudeDTO.getId());
+            if(partyTopicUserAttitudeService.realDelete(partyTopicUserAttitudeEntity)){
+                //更新话题点赞数
+                updateSupportNum(formDto.getTopicId(),-1);
+            }
         }
     }
 
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicUserAttitudeServiceImpl.java
index 5490d65b..0928e019 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicUserAttitudeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicUserAttitudeServiceImpl.java
@@ -103,4 +103,9 @@ public class PartyTopicUserAttitudeServiceImpl extends BaseServiceImpl<PartyTopi
         return baseDao.getPartyTopicUserAttitudeDTO(topicId,userId);
     }
 
+    @Override
+    public Boolean realDelete(PartyTopicUserAttitudeEntity partyTopicUserAttitudeEntity) {
+       return baseDao.realDelete(partyTopicUserAttitudeEntity);
+    }
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml
index f9be8024..7271b921 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupDao.xml
@@ -100,7 +100,7 @@
             if(t1.ID is not null ,1,0) as isJoin
         from epdc_party_group t
      left join epdc_party_user_group t1 on t1.PARTY_GROUP_ID = t.ID and t1.DEL_FLAG ='0' and t1.USER_ID=#{userId}
-         where t.DEL_FLAG ='0' and t.STATE ='0' order by t.CREATED_TIME desc
+         where t.DEL_FLAG ='0' and t.STATE ='0'  and t.DEPT_ID = #{streetId} order by t.CREATED_TIME desc
     </select>
     <select id="getPartyGroupDTOByName" resultType="com.elink.esua.epdc.dto.PartyGroupDTO">
         select ID from epdc_party_group where PARTY_GROUP_NAME = #{partyGroupName} and DEL_FLAG='0' limit 1;
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
index 914d1e6d..8c03d697 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
@@ -28,7 +28,7 @@
     </resultMap>
 
 
-    <select id="selectListOfPartyGroupOfficialsDTO" resultMap="partyGroupOfficialsMap">
+    <select id="selectListOfPartyGroupOfficialsDTO" resultType="com.elink.esua.epdc.dto.PartyGroupOfficialsDTO">
         select
             t.ID,
         t.PARTY_GROUP_ID,
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
index 532d28f9..a473a80e 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
@@ -67,8 +67,8 @@
             t.UPDATED_TIME
         from epdc_party_topic t
         where t.DEL_FLAG ='0'
-        <if test="partyGroupId!=null and partyGroupId!=''">
-            and t.PARTY_GROUP_ID = #{partyGroupId}
+        <if test="groupId!=null and groupId!=''">
+            and t.PARTY_GROUP_ID = #{groupId}
         </if>
         <if test="topicModule!=null and topicModule!=''">
             and t.TOPIC_MODULE = #{topicModule}
@@ -187,14 +187,15 @@
             <if test="topicType != null and topicType != ''">
                 and t.TOPIC_MODULE = #{topicType}
             </if>
+        order by t.CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
-    <update id="updateCommentNum" parameterType="java.lang.String">
-        UPDATE epdc_party_topic SET COMMENT_NUM = COMMENT_NUM + 1 WHERE ID = #{id}
+    <update id="updateCommentNum">
+        UPDATE epdc_party_topic SET COMMENT_NUM = COMMENT_NUM + #{num} WHERE ID = #{id}
     </update>
 
-    <update id="updateSupportNum" parameterType="java.lang.String">
-        UPDATE epdc_party_topic SET SUPPORT_NUM = SUPPORT_NUM + 1 WHERE ID = #{id}
+    <update id="updateSupportNum">
+        UPDATE epdc_party_topic SET SUPPORT_NUM = SUPPORT_NUM + #{num} WHERE ID = #{id}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml
index 77bae54b..608a191a 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicUserAttitudeDao.xml
@@ -15,6 +15,9 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <delete id="realDelete">
+        delete from epdc_party_topic_user_attitude where id = #{id}
+    </delete>
     <select id="getPartyTopicUserAttitudeDTO" resultType="com.elink.esua.epdc.dto.PartyTopicUserAttitudeDTO">
         select id from epdc_party_topic_user_attitude where PARTY_TOPIC_ID = #{topicId} and USER_ID = #{userId}
     </select>