From f83c21fa95dc7d3afaa9b7bb2c08c623fb1fee1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 22 Feb 2024 14:58:24 +0800
Subject: [PATCH] 用户查询修改
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index 202c1a7..0d55d2f 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -25,6 +25,7 @@
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
@@ -36,6 +37,8 @@
import org.springblade.modules.discuss.service.IUserTopicsService;
import org.springblade.modules.discuss.vo.TopicsVO;
import org.springblade.modules.discuss.vo.UserTopicsVO;
+import org.springblade.modules.district.entity.DistrictEntity;
+import org.springblade.modules.district.service.IDistrictService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +59,13 @@
@Override
public IPage<UserTopicsVO> selectUserTopicsPage(IPage<UserTopicsVO> page, UserTopicsVO userTopics) {
+ if (StringUtils.isNotBlank(userTopics.getDistrictId())) {
+ IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
+ DistrictEntity one = bean.getOne(Wrappers.<DistrictEntity>lambdaQuery().eq(DistrictEntity::getId, userTopics.getDistrictId()));
+ if (one != null) {
+ userTopics.setAoiCode(one.getAoiCode());
+ }
+ }
return page.setRecords(baseMapper.selectUserTopicsPage(page, userTopics));
}
@@ -103,6 +113,7 @@
userTopics.setSelected(topic.getSelected());
userTopics.setUserId(AuthUtil.getUserId());
userTopics.setPublicDiscussId(topic.getPublicDiscussId());
+ userTopics.setTopicsId(Integer.valueOf(topic.getSelected()));
userTopics.setArticleId(topic.getArticleId());
userTopics.setHouseCode(topic.getHouseCode());
userTopics.setSignaturePath(topic.getSignaturePath());
@@ -125,6 +136,7 @@
userTopics.setPublicDiscussId(topic.getPublicDiscussId());
userTopics.setArticleId(topic.getArticleId());
userTopics.setHouseCode(topic.getHouseCode());
+ userTopics.setTopicsId((Integer) o);
userTopics.setSignaturePath(topic.getSignaturePath());
objectsTwo.add(userTopics);
UpdateWrapper<TopicsEntity> objectUpdateWrapper = new UpdateWrapper<>();
@@ -132,7 +144,7 @@
objectUpdateWrapper.eq("id", o);
topicsService.update(null, objectUpdateWrapper);
}
- return save(objectsTwo.get(0));
+ return saveBatch(objectsTwo);
}
}
return null;
--
Gitblit v1.9.3