From c0e32b4907e8ac9cae56b77e4f83fefdc8cc5ad3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 24 Jan 2024 17:27:40 +0800
Subject: [PATCH] 机构查询优化
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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..a550453 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,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.pro.packaged.I;
import org.apache.commons.lang3.StringUtils;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.utils.SpringUtils;
@@ -66,6 +67,9 @@
districtIds.addAll(collect);
}
propertyCompanyDistrict.setDistrictIds(districtIds);
+ if (districtIds.size() == 0) {
+ return page.setRecords(new ArrayList<>());
+ }
}
// 街道
@@ -81,17 +85,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 +105,7 @@
if (count > 0) {
throw new Exception("您已有该小区的合同，请勿重复添加！");
}
- bean.updateById(user);
+ // bean.updateById(user);
return save(propertyCompanyDistrict) && submitPropertyDistrictUser(propertyCompanyDistrict);
}
}
@@ -114,10 +118,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