linwe
2024-08-09 8b7258c9427882bb1798f1502eaa35184c6e374e
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.RoleUtil;
import org.springblade.common.utils.SpringUtils;
@@ -37,6 +38,7 @@
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -59,9 +61,11 @@
   @Override
   public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district, regionChildCodesList, isAdministrator);
      CommonParamSet invoke = new CommonParamSet<>().invoke(DistrictVO.class, district);
      List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page,
         district,
         invoke.getRegionChildCodesList(),
         invoke.getIsAdministrator());
      // 遍历
      for (DistrictVO districtVO : districtVOS) {
         // 设置对应的网格名称
@@ -90,6 +94,8 @@
   public Object getDistrictTree(DistrictVO district) {
      // 判断角色,物业角色只能查询当前小区的
      String userRole = AuthUtil.getUserRole();
      CommonParamSet invoke = new CommonParamSet<>().invoke(DistrictVO.class, district);
      if (RoleUtil.isProperty(userRole)) {
         if (district.getFilterFlag().equals(1)) {
            // 查询小区id
@@ -116,7 +122,7 @@
            }
         }
      }
      Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
      Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district,invoke.getRegionChildCodesList(),invoke.getIsAdministrator());
      List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
      stringNodeTree.forEach(node -> recursion(node));
      return stringNodeTree;