bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -20,6 +20,8 @@
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.vo.DistrictVO;
import org.springblade.modules.district.mapper.DistrictMapper;
@@ -27,11 +29,13 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;
import java.util.Map;

/**
 * 小区表 服务实现类
@@ -73,7 +77,14 @@
    */
   @Override
   public Object getDistrictTree(DistrictVO district) {
      List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(baseMapper.getDistrictTree(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);
      // }
      Map<String, TreeStringNode> districtTree = baseMapper.getDistrictTree(district);
      List<TreeStringNode> stringNodeTree = NodeTreeUtil.getStringNodeTree(districtTree);
      stringNodeTree.forEach(node -> recursion(node));
      return stringNodeTree;
   }