From 5ddf5e221d718bc253fb87b8092b7e2ff08788f5 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 09 Apr 2024 16:31:19 +0800
Subject: [PATCH] 维修基金申请添加字段
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..e8f5f7c 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;
@@ -83,7 +85,7 @@
}
if (userRole.contains("jdgly")) {
IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getCommunityCode, regionChildCodesList));
if (list.size() > 0) {
article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
@@ -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