Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java

@@ -22,6 +22,7 @@
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -89,30 +90,31 @@
   public Object getDistrictTree(DistrictVO district) {
      // 判断角色，物业角色只能查询当前小区的
      String userRole = AuthUtil.getUserRole();
      if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
         // if (district.getFilterFlag().equals(1)) {
         // 查询小区id
         IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
         // 通过用户机构查询用户的物业公司
         // 通过用户机构查询用户的物业公司
         IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
         PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
         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);
      if (RoleUtil.isProperty(userRole)) {
         if (district.getFilterFlag().equals(1)) {
            // 查询小区id
            IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
            List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
            // 通过用户机构查询用户的物业公司
            // 通过用户机构查询用户的物业公司
            IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
            PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
               .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
            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);
               }
            }
            district.setDistrictIdList(districtIds);
            if (districtIds.size() == 0) {
               return new ArrayList<>();
            }
         }
         district.setDistrictIdList(districtIds);
         if (districtIds.size() == 0) {
            return new ArrayList<>();
         }
         // }
      }
      Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
      List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);