From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java b/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java
index 213540e..765435c 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/UserPublicEnrollController.java
@@ -110,12 +110,11 @@
userPublicEnroll.setUserId(AuthUtil.getUserId());
// 判断是否一户一票 还是一人一票
IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
- PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getId, userPublicEnroll.getPublicDiscussId()));
+ PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, userPublicEnroll.getArticleId()));
// 一户一票
if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
long count = userPublicEnrollService.count(Wrappers.<UserPublicEnrollEntity>lambdaQuery()
- .eq(UserPublicEnrollEntity::getPublicDiscussId, userPublicEnroll.getPublicDiscussId())
- .eq(UserPublicEnrollEntity::getUserId, userPublicEnroll.getUserId())
+ .eq(UserPublicEnrollEntity::getArticleId, userPublicEnroll.getArticleId())
.eq(UserPublicEnrollEntity::getHouseCode, userPublicEnroll.getHouseCode()));
if (count > 0) {
return R.fail("您房屋已经报名，不能重复报名！");
@@ -123,7 +122,7 @@
// 一人一票
} else {
long count = userPublicEnrollService.count(Wrappers.<UserPublicEnrollEntity>lambdaQuery()
- .eq(UserPublicEnrollEntity::getPublicDiscussId, userPublicEnroll.getPublicDiscussId())
+ .eq(UserPublicEnrollEntity::getArticleId, userPublicEnroll.getArticleId())
.eq(UserPublicEnrollEntity::getUserId, userPublicEnroll.getUserId()));
if (count > 0) {
return R.fail("您已报名，不能重复报名！");
--
Gitblit v1.9.3