From 320872ba37fe6d55e675ddac0119532d72fa1aae Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 27 Mar 2024 16:24:22 +0800
Subject: [PATCH] 一户一票校验bug
---
src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
index 3187b36..dc699bd 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java
@@ -90,22 +90,24 @@
}
PublicDiscussVO publicDiscussVO = baseMapper.selectPublicDiscuss(publicDiscuss);
publicDiscussVO.setDisabled(false);
- // 一户一票
- IUserTopicsService bean = SpringUtils.getBean(IUserTopicsService.class);
- if (publicDiscussVO.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
- long count = bean.count(Wrappers.<UserTopicsEntity>lambdaQuery()
- .eq(UserTopicsEntity::getHouseCode, publicDiscuss.getHouseCode())
- .eq(UserTopicsEntity::getArticleId, publicDiscussVO.getArticleId()));
- if (count > 0) {
- publicDiscussVO.setDisabled(true);
- }
- } else {
- // 一个一票
- long count = bean.count(Wrappers.<UserTopicsEntity>lambdaQuery()
- .eq(UserTopicsEntity::getHouseholdId, householdEntity.getId())
- .eq(UserTopicsEntity::getArticleId, publicDiscussVO.getArticleId()));
- if (count > 0) {
- publicDiscussVO.setDisabled(true);
+ if (householdEntity != null) {
+ // 一户一票
+ IUserTopicsService bean = SpringUtils.getBean(IUserTopicsService.class);
+ if (publicDiscussVO.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
+ long count = bean.count(Wrappers.<UserTopicsEntity>lambdaQuery()
+ .eq(UserTopicsEntity::getHouseCode, publicDiscuss.getHouseCode())
+ .eq(UserTopicsEntity::getArticleId, publicDiscussVO.getArticleId()));
+ if (count > 0) {
+ publicDiscussVO.setDisabled(true);
+ }
+ } else {
+ // 一个一票
+ long count = bean.count(Wrappers.<UserTopicsEntity>lambdaQuery()
+ .eq(UserTopicsEntity::getHouseholdId, householdEntity.getId())
+ .eq(UserTopicsEntity::getArticleId, publicDiscussVO.getArticleId()));
+ if (count > 0) {
+ publicDiscussVO.setDisabled(true);
+ }
}
}
return publicDiscussVO;
--
Gitblit v1.9.3