diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/TagResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/TagResp.java index 43393db77..87f02ecb3 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/TagResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/TagResp.java @@ -36,4 +36,6 @@ public class TagResp extends RecordInfo { private String description; + private Integer sensitiveLevel; + } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java index 4003dc2d2..5f763e2eb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java @@ -58,9 +58,9 @@ public class TagMetaServiceImpl implements TagMetaService { private final DomainService domainService; public TagMetaServiceImpl(TagRepository tagRepository, ModelService modelService, - CollectService collectService, @Lazy DimensionService dimensionService, - @Lazy MetricService metricService, TagObjectService tagObjectService, - DomainService domainService) { + CollectService collectService, @Lazy DimensionService dimensionService, + @Lazy MetricService metricService, TagObjectService tagObjectService, + DomainService domainService) { this.tagRepository = tagRepository; this.modelService = modelService; this.collectService = collectService; @@ -147,6 +147,7 @@ public class TagMetaServiceImpl implements TagMetaService { List modelIds = modelRespList.stream().map(model -> model.getId()).collect(Collectors.toList()); TagFilter tagFilter = new TagFilter(); + BeanUtils.copyProperties(tagMarketPageReq, tagFilter); List collectList = collectService.getCollectList(user.getName()); List collectIds = collectList.stream() .filter(collectDO -> SchemaElementType.TAG.name().equalsIgnoreCase(collectDO.getType())) @@ -158,14 +159,15 @@ public class TagMetaServiceImpl implements TagMetaService { tagFilter.setIds(collectIds); } } - - BeanUtils.copyProperties(tagMarketPageReq, tagFilter); tagFilter.setModelIds(modelIds); PageInfo tagDOPageInfo = PageHelper.startPage(tagMarketPageReq.getCurrent(), tagMarketPageReq.getPageSize()) .doSelectPageInfo(() -> getTags(tagFilter)); List tagRespList = tagDOPageInfo.getList(); + if (CollectionUtils.isEmpty(tagRespList)) { + return tagDOPageInfo; + } fillModelInfo(tagRespList); fillDomainInfo(tagRespList); fillTagObjectInfo(tagRespList, user);