区域查询修改，e呼即办，网格员，网格巡查等过滤修改

zhongrj

2024-04-03 b42bdf8eb9baa28c6d2e363ffaebadfc62d2025a

 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) {
         // 设置对应的网格名称