feat:组织递归查询增加向上向下参数并更改以前的所有向下

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/** 场景联动动作类型 */
+public enum OrganizationEnum {
+  UP,
+  DOWN
+}

@@ -12,9 +12,10 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkUserOrganizationMappingEntity;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 
 import java.util.ArrayList;
@@ -34,12 +35,12 @@ import java.util.stream.Collectors;
 public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMappingService {
 
   private final UserOrganizationMappingMapper userOrganizationMappingMapper;
-  private final OrganizationMapper organizationMapper;
+  private final TkOrganizationService organizationService;
 
   @Override
   public List<String> getUserIdByOrganizationIds(String tenantId, String... ids) {
     List<String> collect =
-        organizationMapper.findOrganizationTreeList(tenantId, List.of(ids)).stream()
+            organizationService.findOrganizationTreeList(tenantId, OrganizationEnum.UP, List.of(ids)).stream()
             .map(OrganizationDTO::getId)
             .collect(Collectors.toList());
     if (null == collect || collect.size() == 0) {
@@ -105,8 +106,8 @@ public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMa
     List<String> organizationIds = null;
     if (StringUtils.isNotEmpty(organizationId)) {
       List<OrganizationDTO> organizationList =
-          organizationMapper.findOrganizationTreeList(
-              tenantId, new HashSet<>(List.of(organizationId)));
+              organizationService.findOrganizationTreeList(
+              tenantId,null, new HashSet<>(List.of(organizationId)));
       if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
         throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }

@@ -17,8 +17,8 @@ import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmContactEntity;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmContactService;
 
@@ -35,7 +35,7 @@ public class TkAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   /** mapper注入 自带方法加入,继承的baseMapper */
   private final AlarmContactMapper alarmContactMapper;
 
-  private final OrganizationMapper ytOrganizationMapper;
+  private final TkOrganizationService organizationService;
 
   private final UserOrganizationMappingService userOrganizationMappingService;
 
@@ -71,7 +71,7 @@ public class TkAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
     ids.add(organizationId);
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
-        ytOrganizationMapper.findOrganizationTreeList(tenantId, ids);
+            organizationService.findOrganizationTreeList(tenantId,null, ids);
     if (null == organizationDTOS || organizationDTOS.size() == 0) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
@@ -201,7 +201,7 @@ public class TkAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
       ids.add(organizationId);
       // 查询该组织的所有子类
       List<OrganizationDTO> organizationDTOS =
-          ytOrganizationMapper.findOrganizationTreeList(tenantId, ids);
+              organizationService.findOrganizationTreeList(tenantId,null, ids);
       List<String> queryOrganizationIds = new ArrayList<>();
       organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
       queryMap.put("organizationIds", queryOrganizationIds);

@@ -19,9 +19,9 @@ import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmEntity;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkAlarmMapper;
 import org.thingsboard.server.dao.yunteng.service.TkAlarmInfoService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +39,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
 
   private final TkAlarmMapper tkJpaAarmDao;
-  private final OrganizationMapper organizationMapper;
+  private final TkOrganizationService organizationService;
 
   @Override
   public TkPageData<TkAlarmEntity> alarmPage(
@@ -64,7 +64,7 @@ public class TkAlarmInfoServiceImpl implements TkAlarmInfoService {
       List<String> filter = new ArrayList<>();
       filter.add(organizationId);
       List<OrganizationDTO> all =
-          organizationMapper.findOrganizationTreeList(tenantId.getId().toString(), filter);
+              organizationService.findOrganizationTreeList(tenantId.getId().toString(),null, filter);
       for (OrganizationDTO item : all) {
         ids.add(item.getId());
       }

@@ -19,11 +19,11 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkAlarmProfileEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkSceneLinkageEntity;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.SceneLinkageMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AlarmProfileService;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -38,7 +38,7 @@ public class TkAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileM
 
     private final SysUserOrganizationMappingServiceImpl userOrganizationMappingService;
 
-    private final OrganizationMapper ytOrganizationMapper;
+    private final TkOrganizationService organizationService;
     private final SceneLinkageMapper sceneLinkageMapper;
 
     @Override
@@ -148,8 +148,8 @@ public class TkAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileM
     public List<AlarmProfileDTO> findAlarmProfileByOrganizationId(
             String organizationId, String tenantId) {
         List<OrganizationDTO> organizationList =
-                ytOrganizationMapper.findOrganizationTreeList(
-                        tenantId, new HashSet<>(List.of(organizationId)));
+                organizationService.findOrganizationTreeList(
+                        tenantId,null, new HashSet<>(List.of(organizationId)));
         if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
             throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         }

@@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -18,12 +17,10 @@ import org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationConte
 import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
-import org.thingsboard.server.dao.audit.AuditLogLevelMask;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationCenterEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkConfigurationContentEntity;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationContentMapper;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.*;
@@ -35,7 +32,7 @@ import java.util.stream.Collectors;
 public class TkConfigurationCenterServiceImpl
     extends AbstractBaseService<ConfigurationCenterMapper, TkConfigurationCenterEntity>
     implements TkConfigurationCenterService {
-  private final OrganizationMapper organizationMapper;
+  private final TkOrganizationService organizationService;
   private final TkConfigurationContentService ytConfigurationContentService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final ConfigurationContentMapper  configurationContentMapper;
@@ -50,8 +47,8 @@ public class TkConfigurationCenterServiceImpl
     if (null != queryMap.get("organizationId")) {
       String organizationId = (String) queryMap.get("organizationId");
       List<OrganizationDTO> organizationList =
-          organizationMapper.findOrganizationTreeList(
-              (String) queryMap.get("tenantId"), new HashSet<>(List.of(organizationId)));
+              organizationService.findOrganizationTreeList(
+              (String) queryMap.get("tenantId"),null, new HashSet<>(List.of(organizationId)));
       if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
         throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }

@@ -19,8 +19,8 @@ import org.thingsboard.server.dao.yunteng.entities.TkDataBoardEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDataComponentEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DataBoardMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DataComponentMapper;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.TkDataBoardService;
 
@@ -31,9 +31,9 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper, TkDataBoardEntity>
     implements TkDataBoardService {
-  private final OrganizationMapper organizationMapper;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final DataComponentMapper dataComponentMapper;
+  private final TkOrganizationService organizationService;
 
   @Override
   public TkPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap, boolean tenantAdmin) {
@@ -50,8 +50,8 @@ public class TkDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
     List<String> organizationIds = null;
     if (null != organizationId) {
       List<OrganizationDTO> list =
-          organizationMapper.findOrganizationTreeList(
-              (String) queryMap.get("tenantId"), new HashSet<>(List.of(organizationId)));
+              organizationService.findOrganizationTreeList(
+              (String) queryMap.get("tenantId"),null, new HashSet<>(List.of(organizationId)));
       if (list.size() == zero) {
         throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }

@@ -17,10 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDataViewEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkDataViewMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.TkDataViewService;
-import org.thingsboard.server.dao.yunteng.service.TkDataViewContentService;
-import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.HashSet;
 import java.util.List;
@@ -34,7 +31,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkDataViewServiceImpl extends AbstractBaseService<TkDataViewMapper, TkDataViewEntity>
     implements TkDataViewService {
-  private final OrganizationMapper organizationMapper;
+  private final TkOrganizationService organizationService;
   private final TkDataViewContentService ytDataViewContentService;
   private final UserOrganizationMappingService userOrganizationMappingService;
 
@@ -44,8 +41,8 @@ public class TkDataViewServiceImpl extends AbstractBaseService<TkDataViewMapper,
     if (null != queryMap.get("organizationId")) {
       String organizationId = (String) queryMap.get("organizationId");
       List<OrganizationDTO> organizationList =
-          organizationMapper.findOrganizationTreeList(
-              (String) queryMap.get("tenantId"), new HashSet<>(List.of(organizationId)));
+              organizationService.findOrganizationTreeList(
+              (String) queryMap.get("tenantId"),null, new HashSet<>(List.of(organizationId)));
       if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
         throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }

@@ -19,9 +19,7 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
-import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
-import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
-import org.thingsboard.server.dao.cache.EntitiesCacheManager;
+import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -30,7 +28,6 @@ import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CACHE;
 
 @Service
 @RequiredArgsConstructor
@@ -111,7 +108,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     String[] ids = deleteDTO.getIds().toArray(new String[deleteDTO.getIds().size()]);
     Set<String> idToDelete =
-        baseMapper.findOrganizationTreeList(tenantId, Arrays.asList(ids)).stream()
+        findOrganizationTreeList(tenantId,null, Arrays.asList(ids)).stream()
             .map(OrganizationDTO::getId)
             .collect(Collectors.toSet());
     if (idToDelete.size() != ids.length) {
@@ -249,7 +246,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
    */
   private List<OrganizationDTO> findOrganizationTree(String tenantId,List<String> organizationIds) {
     List<OrganizationDTO> organizationTreeList =
-        baseMapper.findOrganizationTreeList(tenantId, organizationIds);
+        findOrganizationTreeList(tenantId,null, organizationIds);
     return buildOrganizationDTOTree(organizationTreeList);
   }
 
@@ -296,7 +293,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     if (null != organizationIds && organizationIds.length > 0) {
       Set<String> newBinding =
-          baseMapper.findOrganizationTreeList(tenantId, Arrays.asList(organizationIds)).stream()
+          findOrganizationTreeList(tenantId,null, Arrays.asList(organizationIds)).stream()
               .map(OrganizationDTO::getId)
               .collect(Collectors.toSet());
       Set<String> existBinding =
@@ -372,10 +369,18 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
-            baseMapper.findOrganizationTreeList(tenantId, organizationIds);
+            findOrganizationTreeList(tenantId,null, organizationIds);
     List<String> queryOrganizationIds = new ArrayList<>();
     organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
     return queryOrganizationIds;
   }
 
+  @Override
+  public List<OrganizationDTO> findOrganizationTreeList(String tenantId, OrganizationEnum sort, Collection<String> organizationIds) {
+    if(sort==null) {
+      sort = OrganizationEnum.DOWN;
+    }
+    return baseMapper.findOrganizationTreeList(tenantId,sort.toString(), organizationIds);
+  }
+
 }

@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
 public class TkReportFromConfigServiceImpl
     extends AbstractBaseService<ReportFormConfigMapper, TkReportFormConfigEntity>
     implements TkReportFormConfigService {
-  private final OrganizationMapper organizationMapper;
+  private final TkOrganizationService organizationService;
   private final TkSysJobService tkSysJobService;
   private final TkReportGenerateRecordService tkReportGenerateRecordService;
   private final UserOrganizationMappingService userOrganizationMappingService;
@@ -52,8 +52,8 @@ public class TkReportFromConfigServiceImpl
                 value -> {
                   String organizationId = value.toString();
                   List<OrganizationDTO> list =
-                      organizationMapper.findOrganizationTreeList(
-                          tenantId, List.of(organizationId));
+                          organizationService.findOrganizationTreeList(
+                          tenantId, null,List.of(organizationId));
                   // 查询组织及其子组织
                   if (list.size() > 0) {
                     return list.stream().map(BaseDTO::getId).collect(Collectors.toList());

@@ -9,9 +9,9 @@ import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.yunteng.dto.TkRpcRecordDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkRpcRecordEntity;
-import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.TkRpcRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.TkRpcRecordService;
 
 import java.util.ArrayList;
@@ -28,7 +28,7 @@ public class TkRpcRecordServiceImpl
     extends AbstractBaseService<TkRpcRecordMapper, TkRpcRecordEntity>
     implements TkRpcRecordService {
 
-  private final OrganizationMapper organizationMapper;
+  private final TkOrganizationService organizationService;
 
   @Override
   public TkPageData<TkRpcRecordDTO> page(
@@ -44,7 +44,7 @@ public class TkRpcRecordServiceImpl
       List<String> organizationFilter = new ArrayList<>();
       organizationFilter.add(organizationId);
       organization =
-          organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream()
+              organizationService.findOrganizationTreeList(tenantId,null, organizationFilter).stream()
               .map(org -> org.getId())
               .collect(Collectors.toList());
     }

@@ -48,11 +48,11 @@ public class TkSceneLinkageServiceImpl
   private final DoActionMapper doActionMapper;
   private final DoConditionMapper doConditionMapper;
   private final TriggerMapper triggerMapper;
-  private final OrganizationMapper organizationMapper;
   private final TriggerService triggerService;
   private final DoConditionService doConditionService;
   private final DoActionService doActionService;
   private final TkDeviceProfileMapper profileMapper;
+  private final TkOrganizationService organizationService;
   /**
    * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
    *
@@ -422,7 +422,7 @@ public class TkSceneLinkageServiceImpl
     organizationFilter.add(organizationId);
     // 查询该组织的所有子类
     List<String> orgIds =
-        organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream()
+            organizationService.findOrganizationTreeList(tenantId,null,organizationFilter).stream()
             .map(BaseDTO::getId)
             .collect(Collectors.toList());
     // 拿到当前组织ids所包含的设备集合
@@ -627,7 +627,7 @@ public class TkSceneLinkageServiceImpl
   private List<String> getQueryOrganizationIds(String tenantId, List<String> organizationIds) {
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
-        organizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+            organizationService.findOrganizationTreeList(tenantId,null, organizationIds);
     // 遍历组织id
     List<String> queryOrganizationIds = new ArrayList<>();
     organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkOrganizationEntity;
 
 import java.util.Collection;
@@ -16,8 +17,9 @@ public interface OrganizationMapper extends BaseMapper<TkOrganizationEntity> {
    *
    * @param tenantId 租户code
    * @param organizationIds 待查询的组织ID,可以为空
+   * @param sort 查询顺序 0向下查询,1向下查询
    * @return 组织及子组织，直到叶节点
    */
   List<OrganizationDTO> findOrganizationTreeList(
-      @Param("tenantId") String tenantId, @Param("organizationIds") Collection<String> organizationIds);
+          @Param("tenantId") String tenantId, @Param("sort") String sort, @Param("organizationIds") Collection<String> organizationIds);
 }

 package org.thingsboard.server.dao.yunteng.service;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkOrganizationEntity;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -29,4 +31,6 @@ public interface TkOrganizationService extends BaseService<TkOrganizationEntity>
    * @param organizationId 组织ID
    */
   List<String> organizationAllIds(String tenantId, String organizationId);
+
+  List<OrganizationDTO> findOrganizationTreeList(String tenantId, OrganizationEnum sort, Collection<String> organizationIds);
 }

@@ -29,7 +29,12 @@
         UNION ALL
         SELECT ig.id, ig.parent_id, ig.name, ig.sort,ig.creator,ig.create_time,ig.updater,ig.update_time,ig.remark,ig.tenant_id
         FROM tk_organization ig
-        JOIN organization ON ig.parent_id = organization.id
+        <if test="sort =='UP'">
+            JOIN organization ON ig.id = organization.parent_id
+        </if>
+        <if test="sort == 'DOWN'">
+            JOIN organization ON ig.parent_id = organization.id
+        </if>
         WHERE ig.tenant_id = #{tenantId}
         )
         SELECT id, parent_id, name, sort,creator,create_time,updater,update_time,remark,tenant_id