拿不到地址总表数据，不设置网格信息

linwei

2024-01-31 b3b566ebdfed4005aaa513da3d5d2fd3924903cc

 src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyDistrictServiceImpl.java

@@ -3,8 +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 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;
import org.springblade.core.secure.utils.AuthUtil;
@@ -18,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;
@@ -58,13 +54,15 @@
         // 通过用户机构查询用户的物业公司
         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) {
@@ -72,8 +70,8 @@
         }
      }
      // 街道

      return page.setRecords(baseMapper.selectPropertyCompanyDistrictPage(page, propertyCompanyDistrict));
      List<PropertyCompanyDistrictVO> propertyCompanyDistrictVOS = baseMapper.selectPropertyCompanyDistrictPage(page, propertyCompanyDistrict);
      return page.setRecords(propertyCompanyDistrictVOS);
   }

   /**