Commit 61f86b7124a4ebd5b70e30c44533da3702f49d77

Authored by chenjunyu_1481036421
1 parent ed23e24e

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

... ... @@ -348,12 +348,17 @@ public class TkUserController extends AbstractUserAccount {
348 348 @GetMapping("/customers/{organizationId}")
349 349 public ResponseEntity<List<UserDTO>> getMyCustomers(@PathVariable String organizationId)
350 350 throws ThingsboardException {
  351 + List<String> orgIds= null;
  352 + if(getCurrentUser().isPtCommonTenant()) {
  353 + orgIds = commonTenantOrganizationAllIds();
  354 + }
351 355 return ResponseEntity.ok(
352 356 userService.getMyCustomers(
353 357 organizationId,
354 358 getCurrentUser().getCurrentTenantId(),
355 359 getCurrentUser().isPtTenantAdmin(),
356   - getCurrentUser().isPtCommonTenant()));
  360 + getCurrentUser().isPtCommonTenant(),
  361 + orgIds));
357 362 }
358 363
359 364 @PostMapping("/reset_password/{userId}")
... ...
... ... @@ -681,13 +681,18 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
681 681
682 682 @Override
683 683 public List<UserDTO> getMyCustomers(
684   - String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant) {
  684 + String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant,List<String>orgIds) {
685 685 if (StringUtils.isEmpty(organizationId)) {
686 686 throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
687 687 }
  688 + List<String> userList =
  689 + userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
  690 + if(isPtCommonTenant){
  691 + List<String> DownUserList =
  692 + userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, null, orgIds.toArray(new String[orgIds.size()]));
  693 + userList = userList.stream().filter(DownUserList::contains).collect(Collectors.toList());
  694 + }
688 695 if (isTenantAdmin||isPtCommonTenant) {
689   - List<String> userList =
690   - userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
691 696 if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
692 697 return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
693 698 }
... ...
... ... @@ -126,7 +126,7 @@ public interface TkUserService {
126 126 * @param isTenantAdmin 是否是租户管理员
127 127 * @return 租户创建的所有用户
128 128 */
129   - List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant);
  129 + List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin,boolean isPtCommonTenant,List<String> orgIds);
130 130
131 131 /**
132 132 * 异步获取用户列表
... ...