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 | 22 ++++++++++++++++++++++
1 files changed, 22 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..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
@@ -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;
@@ -52,6 +53,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
/**
* 物业维修资金申请表 服务实现类
*
@@ -61,8 +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));
}
@@ -84,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) {
@@ -104,6 +124,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 +136,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