折线图

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -266,13 +266,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Override
     public VotingTrendResultDTO votingTrendV2(IssueIdFormDTO issueId) {
         IssueEntity issueEntity = issueDao.selectById(issueId.getIssueId());
+        //缓存获取议题表决详情
+        VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId());
+        if (!issueEntity.getSourceType().equals(ModuleConstants.ISSUE_FROM_TOPIC)){
             Result<Integer> allResiByGrid = epmetUserOpenFeignClient.getAllResiByGrid(new AllResiByGridFormDTO(issueEntity.getGridId()));
             if (!allResiByGrid.success()){
                 throw new EpmetException("查询网格下注册居民失败："+issueEntity.getGridId());
             }
-        //缓存获取议题表决详情
-        VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.getVoteStatistical(issueId.getIssueId());
             voteRedisFormDTO.setShouldVoteCount(allResiByGrid.getData());
+        }
         VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO();
         BeanUtils.copyProperties(voteRedisFormDTO, votingTrendResultDTO);
         votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount() + voteRedisFormDTO.getOppositionAmount());