From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/discuss/service/impl/PublicDiscussServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 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..aa99403 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,23 +90,26 @@
}
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);
+ 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);
+ }
}
- } 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