Commit 4338eca08770b234b81da1b648f52f746e2bcacd

Authored by chenjunyu_1481036421
1 parent 97a6468e

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

... ... @@ -20,6 +20,7 @@ import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
20 20 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
21 21 import org.thingsboard.server.dao.yunteng.mapper.TkVideoMapper;
22 22 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
  23 +import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
23 24 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
24 25 import org.thingsboard.server.dao.yunteng.service.TkVideoService;
25 26
... ... @@ -36,7 +37,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
36 37 implements TkVideoService {
37 38
38 39 private final UserOrganizationMappingService userOrganizationMappingService;
39   - private final OrganizationMapper organizationMapper;
  40 + private final TkOrganizationService organizationService;
40 41 @Override
41 42 public TkPageData<TkVideoDTO> pageDatas(IPage<TkVideoEntity> pageInfrom,
42 43 boolean isPtTenantAdmin, String tenantId, String currentUserId,
... ... @@ -155,7 +156,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
155 156 public List<TkVideoDTO> getVideoList(String organizationId, String tenantId) {
156 157 List<String> organizationIds = new ArrayList<>();
157 158 if(StringUtils.isNotEmpty(organizationId)){
158   - List<OrganizationDTO> organizations = organizationMapper.findOrganizationTreeList(tenantId,List.of(organizationId));
  159 + List<OrganizationDTO> organizations = organizationService.findOrganizationTreeList(tenantId,null,List.of(organizationId));
159 160 if(!organizations.isEmpty()){
160 161 organizationIds.addAll(organizations.stream().map(BaseDTO::getId).collect(Collectors.toList()));
161 162 }else{
... ...