From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 eaa64fc..c0cf508 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
@@ -64,18 +64,23 @@
@Service
public class PropertyCapitalApplyServiceImpl extends ServiceImpl<PropertyCapitalApplyMapper, PropertyCapitalApplyEntity> implements IPropertyCapitalApplyService {
+
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<PropertyCapitalApplyVO> selectPropertyCapitalApplyPage(IPage<PropertyCapitalApplyVO> page, PropertyCapitalApplyVO propertyCapitalApply) {
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ propertyCapitalApply.setRegionCode(dept.getRegionCode());
+ }
// 判断角色，物业角色只能查询当前小区的
-
String userRole = AuthUtil.getUserRole();
if (userRole.contains("wygly")) {
IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
propertyCapitalApply.setDistrictIdList(strings);
}
-
-
return page.setRecords(baseMapper.selectPropertyCapitalApplyPage(page, propertyCapitalApply));
}
@@ -97,6 +102,8 @@
IOwnersCommitteeService bean = SpringUtils.getBean(IOwnersCommitteeService.class);
OwnersCommitteeEntity one = bean.getOne(Wrappers.<OwnersCommitteeEntity>lambdaQuery()
.eq(OwnersCommitteeEntity::getAreaId, applyVO.getDistrictId())
+ .eq(OwnersCommitteeEntity::getDeleteFlag,0)
+ .eq(OwnersCommitteeEntity::getStatus,0)
.last("limit 1"));
Integer ownersCommitteeFlag = CommonConstant.NUMBER_TWO;
if (one != null && one.getPrincipalId() != null) {
--
Gitblit v1.9.3