gonglilong
2024-09-13 0cf306a80a8f189a2a664cf447cc0fbef5684bf8
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/DeptServiceImpl.java
@@ -103,11 +103,18 @@
   }
   @Override
   public List<DeptVO> lazyTree(String tenantId, Long parentId) {
   public List<DeptVO> lazyTree(String tenantId, String parentIds) {
      if (AuthUtil.isAdministrator()) {
         tenantId = StringPool.EMPTY;
      }
      return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentId));
      String [] parentIdStr = parentIds.split(",");
      List<Long> parentIdList = new ArrayList<>();
      for (String str:parentIdStr) {
         parentIdList.add(Long.parseLong(str));
      }
      return ForestNodeMerger.merge(baseMapper.lazyTree(tenantId, parentIdList));
   }
   @Override
@@ -241,4 +248,17 @@
   public String getResDept(String deptIds) {
      return baseMapper.getResDept(deptIds);
   }
   @Override
   public List<DeptVO> treeByParentIdNew(String parentId,String precinct) {
//      if (AuthUtil.isAdministrator() || AuthUtil.isAdmin()) {
//         return ForestNodeMerger.merge(baseMapper.tree(StringPool.EMPTY));
//      }
      String [] parentIds = parentId.split(",");
      List<String> parentIdList = new ArrayList<>();
      for (String str:parentIds) {
         parentIdList.add(str);
      }
      return ForestNodeMerger.merge(baseMapper.treeByParentIdNew(parentIdList,precinct));
   }
}