智慧保安后台管理-外网项目备份
Administrator
2021-11-17 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -121,6 +121,10 @@
                  if (dept.getParentId().equals(1123598813738675201L)) {
                     return ForestNodeMerger.merge(baseMapper.lazyTreeCity(tenantId, parentId));
                  }
                  if (dept.getParentId().equals(0L)){
                     //南昌市公安局
                     return ForestNodeMerger.merge(baseMapper.lazyTreeByJurisdiction());
                  }
               }
            }
         }else {
@@ -129,9 +133,8 @@
         }
      }
      //admin
      return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
      return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId,null));
   }
   @Override
   public List<DeptVO> lazyTrees() {
      return  ForestNodeMerger.merge(baseMapper.lazyTrees());
@@ -324,6 +327,11 @@
   }
   @Override
   public List<DeptVO> selectInfos() {
      return baseMapper.selectInfos();
   }
   @Override
   public List<DeptVo> selDeptList() {
      return baseMapper.selDeptList();
   }