feat:分配客户时 如果是普通租户 则根据设备向上当前用户向下组织查询客户

@@ -348,12 +348,17 @@ public class TkUserController extends AbstractUserAccount {
   @GetMapping("/customers/{organizationId}")
   @GetMapping("/customers/{organizationId}")
   public ResponseEntity<List<UserDTO>> getMyCustomers(@PathVariable String organizationId)
   public ResponseEntity<List<UserDTO>> getMyCustomers(@PathVariable String organizationId)
       throws ThingsboardException {
       throws ThingsboardException {
+    List<String> orgIds= null;
+    if(getCurrentUser().isPtCommonTenant()) {
+      orgIds = commonTenantOrganizationAllIds();
+    }
     return ResponseEntity.ok(
     return ResponseEntity.ok(
         userService.getMyCustomers(
         userService.getMyCustomers(
             organizationId,
             organizationId,
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().isPtTenantAdmin(),
             getCurrentUser().isPtTenantAdmin(),
-            getCurrentUser().isPtCommonTenant()));
+            getCurrentUser().isPtCommonTenant(),
+            orgIds));
   }
   }
 
 
   @PostMapping("/reset_password/{userId}")
   @PostMapping("/reset_password/{userId}")

@@ -681,13 +681,18 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
 
 
   @Override
   @Override
   public List<UserDTO> getMyCustomers(
   public List<UserDTO> getMyCustomers(
-      String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant) {
+      String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant,List<String>orgIds) {
     if (StringUtils.isEmpty(organizationId)) {
     if (StringUtils.isEmpty(organizationId)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
+    List<String> userList =
+            userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
+    if(isPtCommonTenant){
+      List<String> DownUserList =
+              userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, null, orgIds.toArray(new String[orgIds.size()]));
+      userList = userList.stream().filter(DownUserList::contains).collect(Collectors.toList());
+    }
     if (isTenantAdmin||isPtCommonTenant) {
     if (isTenantAdmin||isPtCommonTenant) {
-      List<String> userList =
-          userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
         return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
         return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
       }
       }

@@ -126,7 +126,7 @@ public interface TkUserService {
    * @param isTenantAdmin 是否是租户管理员
    * @param isTenantAdmin 是否是租户管理员
    * @return 租户创建的所有用户
    * @return 租户创建的所有用户
    */
    */
-  List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant);
+  List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant,List<String> orgIds);
 
 
   /**
   /**
    * 异步获取用户列表
    * 异步获取用户列表