Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
#	epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -1,5 +1,13 @@
 package com.epmet.resi.group.feign;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
+import com.epmet.resi.group.dto.group.form.GovGroupSummarizeFromDTO;
+import com.epmet.resi.group.dto.group.form.GroupEditionAuditFormDTO;
+import com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO;
+import com.epmet.resi.group.dto.group.result.GroupEditionDetailResultDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
@@ -15,6 +23,10 @@ import com.epmet.resi.group.dto.topic.result.MyCreateTopicsResultDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.dto.topic.result.ParticipatedTopicUnitResultDTO;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.CommonGridAndPageFormDTO;
@@ -103,6 +115,23 @@ public interface ResiGroupOpenFeignClient {
     @PostMapping("/resi/group/group/gov-audit-edit")
     Result govAuditEdit(@RequestBody GroupEditionAuditFormDTO param);
 
+
+    /**
+     * @Description 查询用户参与的且不是自己发表的话题对应的议题Id集合
+     * @author sun
+     */
+    @PostMapping(value = "/resi/group/comment/topictoissuelist")
+    Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO);
+
+    /**
+     * @Description  查询话题所属小组名
+     * @Param groupInfoFormDTO
+     * @author zxc
+     * @date 2020/11/11 1:36 下午
+     */
+    @PostMapping("resi/group/group/groupinfo")
+    Result<List<GroupInfoResultDTO>> selectGroupInfo(@RequestBody GroupInfoFormDTO groupInfoFormDTO);
+
     /**
      * @Description 个人中心-我参与过的话题
      * @param param

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -12,6 +12,9 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.ApplicationDetailFormDTO;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO;
 import com.epmet.resi.group.dto.group.result.ApplicationDetailCopyResultDTO;
 import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO;
@@ -71,6 +74,11 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     public Result govAuditEdit(GroupEditionAuditFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "govAuditEdit", param);
     }
+
+    @Override
+    public Result<List<IssueGridResultDTO>> topicToIssueList(MyPartProjectsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicToIssueList", formDTO);
+    }
     @Override
     public Result<List<GroupInfoResultDTO>> selectGroupInfo(GroupInfoFormDTO groupInfoFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectGroupInfo", groupInfoFormDTO);

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@@ -211,6 +211,8 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 */
 	TopicInfoResultDTO selectTopicInfo(@Param("topicId") String topicId);
 
+	/**
+
 	/**
 	 * @Description  查询话题所属小组名
 	 * @Param groupInfoFormDTO

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -334,7 +334,11 @@ public interface ModuleConstant extends Constant {
 
 	String FIELD_OPERATION_TYPE = "OPERATION_TYPE";
 
-	String CLOSED_TOPIC_REASON_PREFIX="话题已关闭：";
+	String CLOSED_TOPIC_REASON_PREFIX = "话题已关闭：";
+
+	String HIDDEN_TOPIC_REASON_PREFIX = "话题已屏蔽：";
+
+	String CREATE_ISSUE_ERROR = "创建议题失败";
 
 	/**
 	 * 审核操作 同意

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -402,6 +402,15 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
     Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
 
+    /**
+     * @Description 根据角色key查询具有该key的所有角色列表
+     * @return
+     * @author wxz
+     * @date 2020.11.17 16:20
+     */
+    @PostMapping("/epmetuser/govstaffrole/list-roles-by-rolekey/{role-key}")
+    Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(@PathVariable("role-key") String roleKey);
+
     /**
      * @Description 个人中心-我的建议列表
      * @param dto

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -278,6 +278,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", fromDTO);
     }
 
+    @Override
+    public Result<List<GovStaffRoleResultDTO>> listRolesByRoleKey(String roleKey) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listRolesByRoleKey", roleKey);
+    }
+
     @Override
     public Result<List<MyAdviceListResultDTO>> myAdviceList(MyAdviceListFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", dto);

epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml

@@ -52,10 +52,10 @@
             sort
         FROM (
                  SELECT * FROM badge
-                 WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0'
+                 WHERE CUSTOMER_ID = #{customerId} AND DEL_FLAG = '0' AND BADGE_STATUS = 'online'
                  UNION ALL
                  SELECT * FROM badge a
-                 WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0' AND BADGE_STATUS = 'online'
+                 WHERE CUSTOMER_ID = 'default' AND a.DEL_FLAG = '0'
                    AND NOT EXISTS
                      ( SELECT ID FROM badge b WHERE CUSTOMER_ID = #{customerId} AND a.ID = b.ID)) t
         ORDER BY