linwei
2024-01-23 5745a87f3a139ea2bbdaf4704978e4c151ecc45a
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -17,6 +17,7 @@
package org.springblade.modules.district.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
@@ -51,16 +52,11 @@
   @Autowired
   private IGridService gridService;
   @Autowired
   private IDeptService deptService;
   @Override
   public IPage<DistrictVO> selectDistrictPage(IPage<DistrictVO> page, DistrictVO district) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         district.setRegionCode(dept.getRegionCode());
      }
      List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district);
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      List<DistrictVO> districtVOS = baseMapper.selectDistrictPage(page, district,regionChildCodesList,isAdministrator);
      // 遍历
      for (DistrictVO districtVO : districtVOS) {
         // 设置对应的网格名称
@@ -86,12 +82,12 @@
    */
   @Override
   public Object getDistrictTree(DistrictVO district) {
      // String userRole = AuthUtil.getUserRole();
      // if (userRole.equals("wygly")) {
      //    IPropertyDistrictUserService bean = SpringUtils.getBean(IPropertyDistrictUserService.class);
      //    List<String> strings = bean.selectPropertyDistrictByUserId(AuthUtil.getUserId());
      //    district.setDistrictIdList(strings);
      // }
       String userRole = AuthUtil.getUserRole();
       if (userRole.equals("wygly")||userRole.equals("wyxmjl")) {
          // 查询管理的小区  不好过滤小区
         // todo
         // district.setDistrictIdList(strings);
       }
      Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
      List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
      stringNodeTree.forEach(node -> recursion(node));