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

@@ -99,7 +99,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
         //把拿到的数据用,分割成数组
         userList =
             userOrganizationMappingService.getUserIdByOrganizationIds(
-                tenantId, sysNoticeDTO.getPointId().split(","));
+                tenantId,null, sysNoticeDTO.getPointId().split(","));
         break;
       default:
         throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.getMessage());

@@ -38,9 +38,9 @@ public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMa
   private final TkOrganizationService organizationService;
 
   @Override
-  public List<String> getUserIdByOrganizationIds(String tenantId, String... ids) {
+  public List<String> getUserIdByOrganizationIds(String tenantId,OrganizationEnum sort , String... ids) {
     List<String> collect =
-            organizationService.findOrganizationTreeList(tenantId, OrganizationEnum.UP, List.of(ids)).stream()
+            organizationService.findOrganizationTreeList(tenantId, sort, List.of(ids)).stream()
             .map(OrganizationDTO::getId)
             .collect(Collectors.toList());
     if (null == collect || collect.size() == 0) {

@@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.request.*;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
 import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -329,7 +330,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
         queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
     List<String> userIds = null;
     if (null != organizationId) {
-      userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, organizationId);
+      userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,null, organizationId);
       queryMap.put("userIds", userIds);
     }
     if (isPtSysadmin) {
@@ -577,7 +578,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     if (group == null || !group.getTenantId().equals(tenantId)) {
       return Optional.empty();
     }
-    List<String> userIds = userOrganizationMappingService.getUserIdByOrganizationIds(group.getId());
+    List<String> userIds = userOrganizationMappingService.getUserIdByOrganizationIds(group.getId(),null);
     List<SysUserEntity> users = baseMapper.selectBatchIds(userIds);
     return Optional.ofNullable(ReflectUtils.sourceToTarget(users, UserDTO.class));
   }
@@ -662,7 +663,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     }
     if (isTenantAdmin) {
       List<String> userList =
-          userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, organizationId);
+          userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
         return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
       }

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
+
 import java.util.List;
 import java.util.Set;
 
@@ -10,7 +12,7 @@ import java.util.Set;
  */
 public interface UserOrganizationMappingService {
 
-    List<String> getUserIdByOrganizationIds(String tenantId, String... ids);
+    List<String> getUserIdByOrganizationIds(String tenantId, OrganizationEnum sort , String... ids);
 
     /**
      * 添加或更新用户组织关系