From f2d5ea44de8cf97542e99b9c1180b141d5f04105 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 27 Mar 2024 16:52:12 +0800
Subject: [PATCH] 回显同一户投票结果
---
src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java
index 2091ae8..4d3201f 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java
@@ -19,11 +19,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.discuss.dto.TopicsDTO;
+import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.entity.TopicsEntity;
import org.springblade.modules.discuss.mapper.TopicsMapper;
+import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.service.ITopicsService;
import org.springblade.modules.discuss.vo.TopicsVO;
import org.springblade.modules.house.entity.HouseholdEntity;
@@ -51,12 +54,18 @@
IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
.eq(HouseholdEntity::getHouseCode, topicsDTO.getHouseCode())
- .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
- .eq(HouseholdEntity::getIsDeleted,0)
+ .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted, 0)
.last("limit 1"));
if (householdEntity != null) {
topicsDTO.setHouseholdId(householdEntity.getId());
}
- return baseMapper.selectTopicsList( topicsDTO);
+ // 判断是否一户一票,如果一户一票，回显之前投票结果
+ IPublicDiscussService discussService = SpringUtils.getBean(IPublicDiscussService.class);
+ PublicDiscussEntity discussEntity = discussService.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topicsDTO.getArticleId()));
+ if (discussEntity != null && discussEntity.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
+ topicsDTO.setHouseholdId(null);
+ }
+ return baseMapper.selectTopicsList(topicsDTO);
}
}
--
Gitblit v1.9.3