From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index cb8954e..89c5139 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -17,6 +17,8 @@
 import org.springblade.modules.article.vo.ArticleVO;
 import org.springblade.modules.district.entity.DistrictEntity;
 import org.springblade.modules.district.service.IDistrictService;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
 import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
 import org.springblade.modules.property.entity.PropertyCompanyEntity;
 import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
@@ -104,7 +106,16 @@
 		// 查询用户小区的id
 		String districId = baseMapper.getDistrictId(article.getHouseCode());
 		article.setDistrictId(districId);
-		article.setUserId(AuthUtil.getUserId());
+
+		IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+		HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+			.eq(HouseholdEntity::getHouseCode, article.getHouseCode())
+			.eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
+			.eq(HouseholdEntity::getIsDeleted,0)
+			.last("limit 1"));
+		if (householdEntity != null) {
+			article.setHouseholdId(householdEntity.getId());
+		}
 		List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
 		return page.setRecords(articleVOS);
 	}

--
Gitblit v1.9.3