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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 23ac009..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;
@@ -600,8 +601,11 @@
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
- IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
- return bean1.getDistictUserByCode(houseCode);
+// IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+// return bean1.getDistictUserByCode(houseCode);
+ String deptId = AuthUtil.getDeptId();
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserByDept(deptIdList);
}
}
@@ -637,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