From e080306b67822dcba8622aa9b67eb2d3d4c95345 Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Sat, 29 Jun 2024 15:09:07 +0800 Subject: [PATCH] (improvement)(headless) Compatible with historical data after removing model set (#1280) Co-authored-by: lxwcodemonkey --- .../server/web/service/impl/ModelServiceImpl.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java index 35a55a340..4350c2361 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ModelServiceImpl.java @@ -289,18 +289,17 @@ public class ModelServiceImpl implements ModelService { public List getModelRespAuthInheritDomain(User user, Long domainId, AuthType authType) { List domainIds = domainService.getDomainAuthSet(user, authType) - .stream().map(DomainResp::getId) + .stream().filter(domainResp -> { + if (domainId == null) { + return true; + } else { + return domainId.equals(domainResp.getId()) || domainId.equals(domainResp.getParentId()); + } + }).map(DomainResp::getId) .collect(Collectors.toList()); if (CollectionUtils.isEmpty(domainIds)) { return Lists.newArrayList(); } - if (domainId != null) { - if (domainIds.contains(domainId)) { - domainIds = Lists.newArrayList(domainId); - } else { - return Lists.newArrayList(); - } - } ModelFilter modelFilter = new ModelFilter(); modelFilter.setIncludesDetail(false); modelFilter.setDomainIds(domainIds);