From ae2008d288d3a08a230b1179808d02d48391ce63 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 18 Oct 2022 13:36:47 +0800
Subject: [PATCH] vote

---
 .../com/epmet/dto/form/IssueIdFormDTO.java    |  2 +-
 .../com/epmet/dto/result/VoteResultDTO.java   |  2 +-
 .../epmet/service/impl/IssueServiceImpl.java  | 36 ++++++++++---------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
index ce1b760bb3..58d12671de 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java
@@ -19,7 +19,7 @@ public class IssueIdFormDTO implements Serializable {
     /**
      * 当 sourceType = issue 时，是直接创建议题，无需加入小组即可表决
      */
-    private String sourceType;
+    private String sourceType = "resi_topic";
 
 }
 
diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
index 7f81035bf1..dfa73fe47e 100644
--- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
+++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VoteResultDTO.java
@@ -31,7 +31,7 @@ public class VoteResultDTO implements Serializable {
     /**
      * 是否加入小组      已加入：true，未加入：false
      */
-    private Boolean voteAuthorization;
+    private Boolean voteAuthorization = false;
 
     /**
      * 支持：support    反对：oppose
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 6c61788c10..2eddf62d6a 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
@@ -22,6 +22,7 @@ import com.epmet.resi.group.dto.topic.form.TopicDetailBatchFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -217,25 +218,26 @@ public class IssueServiceImpl implements IssueService {
         GridIdFormDTO gridIdFormDTO = new GridIdFormDTO();
         gridIdFormDTO.setGridId(gridId.getGridId());
         gridIdFormDTO.setUserId(tokenDto.getUserId());
-        Result<CheckJoinTeamResultDTO> checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO);
-        if (!checkJoinTeam.success()){
-            throw new RenException("查询校验用户是否加入小组失败");
-        }
-        CheckJoinTeamResultDTO check = checkJoinTeam.getData();
-        //未加入小组
-        if (check.getVoteAuthorization()==false){
-            voteResultDTOResult.setVoteFlag(false);
-            voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
-            voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
-            voteResultDTOResult.setSupportCount(NumConstant.ZERO);
-        }else {
-            Result<VoteResultDTO> voteResult = govIssueFeignClient.voteCount(issueId);
-            if (!voteResult.success()){
-                throw new RenException("查询表决中议题详情——支持、反对数失败");
+        if (issueId.getSourceType().equals("resi_topic")){
+            Result<CheckJoinTeamResultDTO> checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO);
+            if (!checkJoinTeam.success()){
+                throw new RenException("查询校验用户是否加入小组失败");
+            }
+            CheckJoinTeamResultDTO check = checkJoinTeam.getData();
+            //未加入小组
+            if (check.getVoteAuthorization()==false){
+                voteResultDTOResult.setVoteFlag(false);
+                voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
+                voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
+                voteResultDTOResult.setSupportCount(NumConstant.ZERO);
             }
-            voteResultDTOResult = voteResult.getData();
-            voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
+            return voteResultDTOResult;
+        }
+        Result<VoteResultDTO> voteResult = govIssueFeignClient.voteCount(issueId);
+        if (!voteResult.success()){
+            throw new RenException("查询表决中议题详情——支持、反对数失败");
         }
+        voteResultDTOResult = voteResult.getData();
         return voteResultDTOResult;
     }