拿不到地址总表数据，不设置网格信息

linwei

2024-01-31 b3b566ebdfed4005aaa513da3d5d2fd3924903cc

 src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -29,12 +29,16 @@
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.mapper.DeptMapper;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
@@ -99,28 +103,13 @@

   @Override
   public List<DeptVO> tree(String tenantId) {
      Long parentId = null;
      Long id = null;
      // 判断数据权限控制,非超管角色只可看到本级及以下数据
//      if (!AuthUtil.isAdministrator()) {
//         Long deptId = Func.firstLong(AuthUtil.getDeptId());
//         Dept dept = SysCache.getDept(deptId);
//         if (dept.getParentId() != 0) {
//            parentId = dept.getParentId();
//         }
//         List<DeptVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId));
//         List<DeptVO> copy = BeanUtil.copy(merge, DeptVO.class);
//         copy = copy.stream().filter(item -> AuthUtil.getDeptId().contains(item.getId().toString())).collect(Collectors.toList());
//         return copy;
//      }
      String userRole = AuthUtil.getUserRole();
      // 判断物业公司
      if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
         // 获取当前用户的机构
      if (!AuthUtil.isAdmin()) {
         id = Func.firstLong(AuthUtil.getDeptId());
      }

      return ForestNodeMerger.merge(baseMapper.tree(tenantId, parentId, id));
      List<DeptVO> tree = baseMapper.tree(tenantId, id);
      return ForestNodeMerger.merge(tree);
   }

   @Override
@@ -136,7 +125,7 @@
//            parentId = dept.getParentId();
//         }
//      }
      if (Func.toLong(parentId) == 0L && !AuthUtil.isAdministrator()) {
      if (Func.toLong(parentId) == 0L && !AuthUtil.isAdmin()) {
         Long deptId = Func.firstLong(AuthUtil.getDeptId());
         Dept dept = SysCache.getDept(deptId);
         if (dept.getParentId() != 0) {
@@ -327,24 +316,65 @@
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Object dataHandle() {
      // 查询未绑定的网格
      List<TreeStringNode> list = regionService.getTree(null);
      // 查询所有的社区
      QueryWrapper<Region> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("district_code","361102").eq("region_level",5);
      List<Region> list = regionService.list(queryWrapper);
      // 遍历
      for (TreeStringNode treeStringNode : list) {
      for (Region region : list) {
         // 查询是否已创建
         QueryWrapper<Dept> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted", 0).eq("dept_name", treeStringNode.getName());
         wrapper.eq("is_deleted", 0).eq("dept_name", region.getName());
         Dept one = getOne(wrapper);
         if (null == one) {
            // 新增
            Dept dept = new Dept();
            dept.setParentId(1733066387113734145L);
            dept.setFullName(treeStringNode.getName());
            dept.setDeptName(treeStringNode.getName());
            dept.setFullName(region.getName());
            dept.setDeptName(region.getName());
            dept.setDeptCategory(1);
            dept.setTenantId("000000");
            // 查询上级id
            QueryWrapper<Dept> deptQueryWrapper = new QueryWrapper<>();
            deptQueryWrapper.eq("is_deleted", 0).eq("dept_name", region.getTownName());
            Dept parentDept = getOne(deptQueryWrapper);
            if (null!=parentDept){
               dept.setParentId(parentDept.getId());
               dept.setAncestors(parentDept.getAncestors() + "," + parentDept.getId());
            }
            dept.setRegionCode(region.getCode());
            // 新增
            save(dept);
            saveOrUpdate(dept);
            // 插入社区表数据
         }
      }
      return null;
   }


   /**
    * 数据处理(社区绑定）--处理机构
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Object dataHandleCommunity() {
      // 查询所有的社区
      QueryWrapper<Region> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("district_code","361102").eq("region_level",5);
      List<Region> list = regionService.list(queryWrapper);
      // 遍历
      for (Region region : list) {
         // 查询是否已创建
         QueryWrapper<CommunityEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted", 0).eq("name", region.getName());
         CommunityEntity one = SpringUtil.getBean(ICommunityService.class).getOne(wrapper);
         if (null == one) {
            // 新增
            CommunityEntity communityEntity = new CommunityEntity();
            communityEntity.setStreetCode(region.getTownCode());
            communityEntity.setName(region.getName());
            communityEntity.setCode(region.getCode());
            // 新增
            SpringUtil.getBean(ICommunityService.class).save(communityEntity);
         }
      }
      return null;