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/service/impl/PublicDiscussServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 1a63151..f8c756b 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
@@ -17,9 +17,12 @@
package org.springblade.modules.discuss.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
import org.springblade.modules.discuss.mapper.PublicDiscussMapper;
@@ -28,6 +31,8 @@
import org.springblade.modules.discuss.service.IUserTopicsService;
import org.springblade.modules.discuss.vo.PublicDiscussVO;
import org.springblade.modules.discuss.vo.UserTopicsVO;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -53,7 +58,7 @@
List<PublicDiscussVO> publicDiscussVOS = baseMapper.selectPublicDiscussPage(page, publicDiscuss);
for (PublicDiscussVO publicDiscussVO : publicDiscussVOS) {
Long result = iUserPublicEnrollService.getCount(publicDiscussVO.getId());
- if(result != null){
+ if (result != null) {
publicDiscussVO.setEnrollCount(result.intValue());
}
UserTopicsVO userTopicsVo = new UserTopicsVO();
@@ -73,6 +78,15 @@
@Override
public PublicDiscussVO getDetail(PublicDiscussVO publicDiscuss) {
+ IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+ HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getHouseCode, publicDiscuss.getHouseCode())
+ .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted, 0)
+ .last("limit 1"));
+ if (householdEntity != null) {
+ publicDiscuss.setHouseholdId(householdEntity.getId());
+ }
return baseMapper.selectPublicDiscuss(publicDiscuss);
}
}
--
Gitblit v1.9.3