From 0c29964e2a69410f15ccf4271aa9180012737f71 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 22 Dec 2023 15:59:32 +0800
Subject: [PATCH] 维修基金审核+业委会

---
 src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
index 89177f4..794135a 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java
@@ -41,6 +41,7 @@
 import org.springblade.modules.property.entity.PropertyCapitalApplyEntity;
 import org.springblade.modules.property.mapper.PropertyCapitalApplyMapper;
 import org.springblade.modules.property.service.IPropertyCapitalApplyService;
+import org.springblade.modules.property.service.IPropertyDistrictUserService;
 import org.springblade.modules.property.vo.PropertyCapitalApplyVO;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.Region;
@@ -51,6 +52,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * 物业维修资金申请表 服务实现类
@@ -63,6 +66,16 @@
 
 	@Override
 	public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
+		// 判断角色,物业角色只能查询当前小区的
+
+		String userRole = AuthUtil.getUserRole();
+		if (userRole.equals("wygly")) {
+			IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
+			List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
+			propertyCapitalApply.setDistrictIdList(strings);
+		}
+
+
 		return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
 	}
 
@@ -104,6 +117,7 @@
 				Region one2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 9)));
 				Dept one3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, one2.getName()));
 				one4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, one3.getId())
+					.eq(User::getRoleId,"1729814500990304258")
 					.eq(User::getIsDeleted,0)
 					.last("limit 1"));
 			} catch (Exception e) {
@@ -115,6 +129,7 @@
 				Region region2 = region.getOne(Wrappers.<Region>lambdaQuery().eq(Region::getCode, one1.getCommunityCode().substring(0, 6)));
 				Dept dept3 = dept.getOne(Wrappers.<Dept>lambdaQuery().eq(Dept::getDeptName, region2.getName() + "住建局").last("limit 1"));
 				user4 = user.getOne(Wrappers.<User>lambdaQuery().eq(User::getDeptId, dept3.getId())
+					.eq(User::getRoleId,"1738072768615333890")
 					.eq(User::getIsDeleted,0)
 					.last("limit 1"));
 			} catch (Exception e) {

--
Gitblit v1.9.3