Commit b07a48c6fd73e551018c6dd51d3ef3e1d17de821
Merge remote-tracking branch 'origin/CommonTenant' into CommonTenant
Showing
1 changed file
with
4 additions
and
1 deletions
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserOrganizationMappingServiceImpl.java
| @@ -39,8 +39,11 @@ public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMa | @@ -39,8 +39,11 @@ public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMa | ||
| 39 | 39 | ||
| 40 | @Override | 40 | @Override |
| 41 | public List<String> getUserIdByOrganizationIds(String tenantId,OrganizationEnum sort , String... ids) { | 41 | public List<String> getUserIdByOrganizationIds(String tenantId,OrganizationEnum sort , String... ids) { |
| 42 | + if(null == sort){ | ||
| 43 | + sort = OrganizationEnum.DOWN; | ||
| 44 | + } | ||
| 42 | List<String> collect = | 45 | List<String> collect = |
| 43 | - organizationMapper.findOrganizationTreeList(tenantId, sort !=null?sort.toString():null, List.of(ids)).stream() | 46 | + organizationMapper.findOrganizationTreeList(tenantId, sort.toString(), List.of(ids)).stream() |
| 44 | .map(OrganizationDTO::getId) | 47 | .map(OrganizationDTO::getId) |
| 45 | .collect(Collectors.toList()); | 48 | .collect(Collectors.toList()); |
| 46 | if (null == collect || collect.size() == 0) { | 49 | if (null == collect || collect.size() == 0) { |