From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 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