From 6eee4b541724bec79e0a2de2daa56b8f91ee8a65 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 11 Oct 2022 08:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssueVoteDetailServiceImpl.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index 0996cfb503..44812532ab 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -159,18 +159,18 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         /**
          * 直接创建议题的，应表决数为网格下的注册居民数
          */
-        if (formDTO.getSourceType().equals(ModuleConstants.ISSUE)){
-            Result<Integer> allResi = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueDTO.getGridId()));
-            if (!allResi.success()){
-                throw new EpmetException("查询网格下的注册居民失败:"+issueDTO.getGridId());
-            }
-            redisData.setShouldVoteCount(allResi.getData());
-        }else {
+        if (formDTO.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){
             Result<Integer> integerResult = resiGroupFeignClient.votableCount(dto);
             if (!integerResult.success()){
                 throw new EpmetException("查询应表决人数失败...");
             }
             redisData.setShouldVoteCount(integerResult.getData());
+        }else {
+            Result<Integer> allResi = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueDTO.getGridId()));
+            if (!allResi.success()){
+                throw new EpmetException("查询网格下的注册居民失败:"+issueDTO.getGridId());
+            }
+            redisData.setShouldVoteCount(allResi.getData());
         }
         issueVoteDetailRedis.set(redisData);
         Integer checkoutVoteCount = baseDao.checkoutVote(formDTO);