From 02239b141ffa6cb972fffc9e16d78ebbca314c57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 12 Mar 2024 17:48:57 +0800
Subject: [PATCH] 房屋导入修改(地址设置)

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 259c52c..aa6c93c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -24,6 +24,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
 import org.springblade.common.cache.DictCache;
@@ -640,6 +641,9 @@
 	@Override
 	public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
 		// 查询物业公司,获取物业公司的机构
+		if(StringUtils.isBlank(propertyCompanyId)){
+			return new ArrayList<>();
+		}
 		IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
 		PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getId, propertyCompanyId));
 		return baseMapper.getUserInfoByPropertyId(one.getDeptId().toString(), roleId);

--
Gitblit v1.9.3