feat: 组织下拉列表增加通过组织Id过滤

@@ -60,12 +60,13 @@ public class TkOrganizationController extends BaseController {
 
 
   @GetMapping("/me/list")
   @GetMapping("/me/list")
   @ApiOperation("下拉列表")
   @ApiOperation("下拉列表")
-  public ResponseEntity getMyOrganizations() throws ThingsboardException {
+  public ResponseEntity getMyOrganizations(@RequestParam(required = false,name = "organizationId")String organizationId) throws ThingsboardException {
     List<OrganizationDTO> result = organizationService.getMyOrganizations(
     List<OrganizationDTO> result = organizationService.getMyOrganizations(
             getCurrentUser().isPtSysadmin(),
             getCurrentUser().isPtSysadmin(),
             getCurrentUser().isPtTenantAdmin(),
             getCurrentUser().isPtTenantAdmin(),
+            getCurrentUser().isCustomerUser(),
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentTenantId(),
-            getCurrentUser().getCurrentUserId());
+            getCurrentUser().getCurrentUserId(),organizationId);
     return ResponseEntity.ok(result);
     return ResponseEntity.ok(result);
   }
   }
 
 

@@ -73,7 +73,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     if (isCustomerOrPlatform) {
     if (isCustomerOrPlatform) {
       if (StringUtils.isEmpty(organizationDTO.getParentId())) {
       if (StringUtils.isEmpty(organizationDTO.getParentId())) {
         // 获取当前用户的最顶级组织ID的父ID
         // 获取当前用户的最顶级组织ID的父ID
-        List<OrganizationDTO> myOrganizations = getMyOrganizations(false, false, tenantId, userId);
+        List<OrganizationDTO> myOrganizations = getMyOrganizations(false, false, false,tenantId, userId,null);
         if (null != myOrganizations && myOrganizations.size() > 0) {
         if (null != myOrganizations && myOrganizations.size() > 0) {
           OrganizationDTO organizationDto = myOrganizations.get(0);
           OrganizationDTO organizationDto = myOrganizations.get(0);
           String parentId = organizationDto.getParentId();
           String parentId = organizationDto.getParentId();
@@ -212,10 +212,11 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
 
   @Override
   @Override
   public List<OrganizationDTO> getMyOrganizations(
   public List<OrganizationDTO> getMyOrganizations(
-      boolean isPtSysAdmin, boolean isPtTenantAdmin, String tenantId, String currentUserId) {
+      boolean isPtSysAdmin, boolean isPtTenantAdmin,boolean isCustomer, String tenantId, String currentUserId,String organizationId) {
     // 如果是租户管理员,则返回该租户id下的所有组织
     // 如果是租户管理员,则返回该租户id下的所有组织
-    if (isPtTenantAdmin) {
-      return findOrganizationTree(tenantId);
+    if (isPtTenantAdmin || isPtSysAdmin || !isCustomer) {
+      List<String> organizationIds = StringUtils.isEmpty(organizationId)?null:List.of(organizationId);
+      return findOrganizationTree(tenantId,organizationIds);
     } else {
     } else {
       // 返回当前用户组织id集
       // 返回当前用户组织id集
       Set<String> organizationIds =
       Set<String> organizationIds =
@@ -227,30 +228,28 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
               .stream()
               .stream()
               .map(TkUserOrganizationMappingEntity::getOrganizationId)
               .map(TkUserOrganizationMappingEntity::getOrganizationId)
               .collect(Collectors.toSet());
               .collect(Collectors.toSet());
-      List<TkOrganizationEntity> organizations;
-      if (organizationIds.size() > 0 || isPtSysAdmin) {
-        organizations =
-            baseMapper.selectList(
-                new QueryWrapper<TkOrganizationEntity>()
-                    .lambda()
-                    .eq(TkOrganizationEntity::getTenantId, tenantId)
-                    .in(organizationIds.size() > 0, TkOrganizationEntity::getId, organizationIds));
+      if(!StringUtils.isEmpty(organizationId)){
+        organizationIds = new HashSet<>(List.of(organizationId));
+      }
+      if (organizationIds.size() > 0) {
+        return findOrganizationTree(tenantId, new ArrayList<>(organizationIds));
       } else {
       } else {
         return null;
         return null;
       }
       }
-      return TreeUtils.buildTree(ReflectUtils.sourceToTarget(organizations, OrganizationDTO.class));
+
     }
     }
   }
   }
 
 
   /**
   /**
-   * 查询租户id下的所有组织
+   * 查询租户id下的所有组织或对应组织的下级组织及本身
    *
    *
    * @param tenantId 租户ID
    * @param tenantId 租户ID
+   * @param organizationIds 组织IDS
    * @return 组织列表
    * @return 组织列表
    */
    */
-  private List<OrganizationDTO> findOrganizationTree(String tenantId) {
+  private List<OrganizationDTO> findOrganizationTree(String tenantId,List<String> organizationIds) {
     List<OrganizationDTO> organizationTreeList =
     List<OrganizationDTO> organizationTreeList =
-        baseMapper.findOrganizationTreeList(tenantId, null);
+        baseMapper.findOrganizationTreeList(tenantId, organizationIds);
     return buildOrganizationDTOTree(organizationTreeList);
     return buildOrganizationDTOTree(organizationTreeList);
   }
   }
 
 

@@ -12,7 +12,7 @@ public interface TkOrganizationService extends BaseService<TkOrganizationEntity>
   boolean deleteOrganizations(DeleteDTO deleteDTO,String tenantId);
   boolean deleteOrganizations(DeleteDTO deleteDTO,String tenantId);
 
 
   List<OrganizationDTO> getMyOrganizations(
   List<OrganizationDTO> getMyOrganizations(
-          boolean isPtSysAdmin,boolean isPtTenantAdmin, String tenantId, String currentUserId);
+          boolean isPtSysAdmin,boolean isPtTenantAdmin,boolean isCustomer, String tenantId, String currentUserId,String organizationId);
 
 
   OrganizationDTO updateOrganization(OrganizationDTO organizationDTO, String tenantId,boolean isCustomerOrPlatform,String userId);
   OrganizationDTO updateOrganization(OrganizationDTO organizationDTO, String tenantId,boolean isCustomerOrPlatform,String userId);