From 5a8d8ffa4d95ece3c098ee221a7cd36d6a75fa4b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Oct 2022 12:54:42 +0800
Subject: [PATCH] =?UTF-8?q?/resi/group/topic/selectdetail=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/IssueResultDTO.java    | 2 ++
 .../src/main/resources/mapper/IssueDao.xml                | 8 +++++++-
 .../java/com/epmet/service/impl/IcEventServiceImpl.java   | 2 +-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java  | 3 +++
 .../java/com/epmet/service/impl/IssueServiceImpl.java     | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
index a08efd39b4..c87d9e5f51 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java
@@ -60,6 +60,8 @@ public class IssueResultDTO implements Serializable {
      */
     private String sourceType;
 
+    private String sourceId;
+
     /**
      * 发布议题的图片
      */
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index effe000fe6..fb7e943e3a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -31,6 +31,7 @@
     <resultMap id="IssueResultDTOMap" type="com.epmet.dto.result.IssueResultDTO">
         <id column="issueId" property="issueId" />
         <result column="topicId" property="topicId"/>
+        <result column="source_id" property="sourceId"/>
         <result column="issueTitle" property="issueTitle"/>
         <result column="issueStatus" property="issueStatus"/>
         <result column="issueSuggestion" property="issueSuggestion"/>
@@ -46,7 +47,12 @@
     <select id="issueDetail" parameterType="com.epmet.dto.form.IssueDetailFormDTO" resultMap="IssueResultDTOMap">
         SELECT
             i.id as issueId,
-            i.source_id AS topicId,
+            (
+              case when i.SOURCE_TYPE='resi_topic'then i.source_id
+                else ''
+                end
+            )as topicId,
+            i.source_id,
             i.issue_title AS issueTitle,
             i.issue_status AS issueStatus,
             i.suggestion AS issueSuggestion,
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index abddc4c099..3fba9bf715 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -472,7 +472,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 // log.info("delete userDemand result:{},eventId:{}", effectRow, id);
             } else if(NumConstant.THREE_STR.equals(entity.getOperationType())){
                 DelIssueFormDTO delIssueFormDTO = new DelIssueFormDTO();
-                delIssueFormDTO.setCustomerId(delIssueFormDTO.getCustomerId());
+                delIssueFormDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());
                 delIssueFormDTO.setUserId(loginUserUtil.getLoginUserId());
                 delIssueFormDTO.setIssueIds(Arrays.asList(entity.getOperationId()));
                 // 删除议题, 议题转了项目的，再单独去删除项目
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 6590ff1a60..65d7082753 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
@@ -1533,6 +1533,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Override
     public TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO) {
         TopicInfoDTO topicInfo = resiTopicDao.selectDetail(formDTO);
+        if(){
+
+        }
         //话题图片
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 1b46ac9e40..0a3f0af97f 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -94,7 +94,7 @@ public class IssueServiceImpl implements IssueService {
         TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO();
         topicInfoFormDTO.setTopicId(issueResult.getTopicId());
         TopicInfoDTO topicInfoDTOResult = new TopicInfoDTO();
-        if (!StringUtils.isBlank(issueResult.getTopicId())) {
+        if (!StringUtils.isBlank(issueResult.getTopicId())&&"resi_topic".equals(issueResult.getSourceType())) {
             topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO).getData();
             issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult);
         }