From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
index cc4f04d..78fe815 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
@@ -17,8 +16,6 @@
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCompanyDistrictVO;
-import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,19 +54,24 @@
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
- IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
- // 通过物业公司，查询小区
- List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
- .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
- if (list.size() > 0) {
- List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
- districtIds.addAll(collect);
+ if (one != null) {
+ IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ // 通过物业公司，查询小区
+ List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
+ if (list.size() > 0) {
+ List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
+ districtIds.addAll(collect);
+ }
}
propertyCompanyDistrict.setDistrictIds(districtIds);
+ if (districtIds.size() == 0) {
+ return page.setRecords(new ArrayList<>());
+ }
}
// 街道
-
- return page.setRecords(baseMapper.selectPropertyCompanyDistrictPage(page, propertyCompanyDistrict));
+ List<PropertyCompanyDistrictVO> propertyCompanyDistrictVOS = baseMapper.selectPropertyCompanyDistrictPage(page, propertyCompanyDistrict);
+ return page.setRecords(propertyCompanyDistrictVOS);
}
/**
@@ -81,17 +83,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdatePropertyCompanyDistrict(PropertyCompanyDistrictEntity propertyCompanyDistrict) throws Exception {
- IUserService bean = SpringUtil.getBean(IUserService.class);
- User user = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, propertyCompanyDistrict.getPrincipal()));
- if (StringUtils.isNotBlank(user.getRoleId())) {
- if (!user.getRoleId().contains("1747504028253229058")) {
- user.setRoleId(user.getRoleId() + ",1747504028253229058");
- }
- } else {
- user.setRoleId("1747504028253229058");
- }
+ // IUserService bean = SpringUtil.getBean(IUserService.class);
+ // User user = bean.getOne(Wrappers.<User>lambdaQuery().eq(User::getId, propertyCompanyDistrict.getPrincipal()));
+ // if (StringUtils.isNotBlank(user.getRoleId())) {
+ // if (!user.getRoleId().contains("1747504028253229058")) {
+ // user.setRoleId(user.getRoleId() + ",1747504028253229058");
+ // }
+ // } else {
+ // user.setRoleId("1747504028253229058");
+ // }
if (null != propertyCompanyDistrict.getId()) {
- bean.updateById(user);
+ // bean.updateById(user);
return updateById(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
} else {
long count = count(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
@@ -101,7 +103,7 @@
if (count > 0) {
throw new Exception("您已有该小区的合同，请勿重复添加！");
}
- bean.updateById(user);
+ // bean.updateById(user);
return save(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
}
}
@@ -114,10 +116,11 @@
*/
private boolean submitPropertyDistrictUser(PropertyCompanyDistrictEntity propertyCompanyDistrict) {
List<Long> userIdList = Func.toLongList(propertyCompanyDistrict.getUserId());
+ List<Long> arrayList = new ArrayList<Long>(userIdList);
// 把项目经理也加到物业用户关联表
- userIdList.add(Long.valueOf(propertyCompanyDistrict.getPrincipal()));
+ arrayList.add(Long.valueOf(propertyCompanyDistrict.getPrincipal()));
List<PropertyDistrictUserEntity> propertyDistrictUserEntityList = new ArrayList<>();
- userIdList.forEach(userId -> {
+ arrayList.forEach(userId -> {
PropertyDistrictUserEntity propertyDistrictUserEntity = new PropertyDistrictUserEntity();
propertyDistrictUserEntity.setUserId(userId);
propertyDistrictUserEntity.setPropertyCompanyDistrictId(propertyCompanyDistrict.getId());
--
Gitblit v1.9.3