From c02703a1aef70d2bb830c63652df72c98403db39 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 10:58:19 +0800
Subject: [PATCH] 小区用户支持栋，单元+名字查询
---
src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 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 bd40dce..a1281cd 100644
--- a/src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java
+++ b/src/main/java/org/springblade/modules/discuss/controller/UserTopicsController.java
@@ -122,26 +122,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));
}
@@ -167,7 +147,7 @@
public R updateBath(@Valid @RequestBody List<TopicsVO> topics) throws Exception {
String result = userTopicsService.batchSave(topics);
if (result.equals("200")) {
- R.data("操作成功");
+ return R.data("操作成功");
}
return R.fail(result);
}
--
Gitblit v1.9.3