From 40a647b468d117381abf63d9f98f1cc9308ef3fc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 27 Mar 2024 10:23:47 +0800
Subject: [PATCH] 议事查询优化

---
 src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java b/src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java
index 39affc8..5f806a0 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java
@@ -121,28 +121,7 @@
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入userTopics")
 	public R submit(@Valid @RequestBody UserTopicsEntity userTopics) {
-		userTopics.setUserId(AuthUtil.getUserId());
-		// 判断是否一户一票 还是一人一票
-		IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
-		PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getId, userTopics.getPublicDiscussId()));
-		// 一户一票
-		if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
-			long count = userTopicsService.count(Wrappers.<UserTopicsEntity>lambdaQuery()
-				.eq(UserTopicsEntity::getPublicDiscussId, userTopics.getPublicDiscussId())
-				.eq(UserTopicsEntity::getHouseCode, userTopics.getHouseCode()));
-			if (count > 0) {
-				return R.fail("您房屋已经投票,不能重复投票!");
-			}
-			// 一人一票
-		} else {
-			long count = userTopicsService.count(Wrappers.<UserTopicsEntity>lambdaQuery()
-				.eq(UserTopicsEntity::getPublicDiscussId, userTopics.getPublicDiscussId())
-				.eq(UserTopicsEntity::getUserId, userTopics.getUserId()));
-			if (count > 0) {
-				return R.fail("您已投票,不能重复投票!");
-			}
-		}
-		return R.status(userTopicsService.save(userTopics));
+		return R.status(userTopicsService.saveUserTopicsEntity(userTopics));
 	}
 
 	/**

--
Gitblit v1.9.3