vote

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";
 
 }
 

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

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,6 +218,7 @@ public class IssueServiceImpl implements IssueService {
         GridIdFormDTO gridIdFormDTO = new GridIdFormDTO();
         gridIdFormDTO.setGridId(gridId.getGridId());
         gridIdFormDTO.setUserId(tokenDto.getUserId());
+        if (issueId.getSourceType().equals("resi_topic")){
             Result<CheckJoinTeamResultDTO> checkJoinTeam = resiGroupFeignClient.checkjointeam(gridIdFormDTO);
             if (!checkJoinTeam.success()){
                 throw new RenException("查询校验用户是否加入小组失败");
@@ -228,14 +230,14 @@ public class IssueServiceImpl implements IssueService {
                 voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
                 voteResultDTOResult.setOppositionCount(NumConstant.ZERO);
                 voteResultDTOResult.setSupportCount(NumConstant.ZERO);
-        }else {
+            }
+            return voteResultDTOResult;
+        }
         Result<VoteResultDTO> voteResult = govIssueFeignClient.voteCount(issueId);
         if (!voteResult.success()){
             throw new RenException("查询表决中议题详情——支持、反对数失败");
         }
         voteResultDTOResult = voteResult.getData();
-            voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization());
-        }
         return voteResultDTOResult;
     }