From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/property/service/impl/PropertyCapitalApplyServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 794135a..d43ca8e 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
@@ -69,7 +69,7 @@
 		// 判断角色,物业角色只能查询当前小区的
 
 		String userRole = AuthUtil.getUserRole();
-		if (userRole.equals("wygly")) {
+		if (userRole.contains("wygly")) {
 			IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
 			List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
 			propertyCapitalApply.setDistrictIdList(strings);
@@ -97,6 +97,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