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/TopicsServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java
index 7129005..2091ae8 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/TopicsServiceImpl.java
@@ -17,13 +17,17 @@
 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.secure.utils.AuthUtil;
 import org.springblade.modules.discuss.dto.TopicsDTO;
 import org.springblade.modules.discuss.entity.TopicsEntity;
 import org.springblade.modules.discuss.mapper.TopicsMapper;
 import org.springblade.modules.discuss.service.ITopicsService;
 import org.springblade.modules.discuss.vo.TopicsVO;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -44,7 +48,15 @@
 
 	@Override
 	public List<TopicsDTO> selectTopicsList(TopicsDTO topicsDTO) {
-		topicsDTO.setUserId(AuthUtil.getUserId());
+		IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+		HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+			.eq(HouseholdEntity::getHouseCode, topicsDTO.getHouseCode())
+			.eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
+			.eq(HouseholdEntity::getIsDeleted,0)
+			.last("limit 1"));
+		if (householdEntity != null) {
+			topicsDTO.setHouseholdId(householdEntity.getId());
+		}
 		return  baseMapper.selectTopicsList( topicsDTO);
 	}
 }

--
Gitblit v1.9.3