From 7b46ef64fd7bfa744f7178fdc2f6daaf1ccebc66 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Sat, 4 Jan 2025 22:23:55 +0800 Subject: [PATCH] [fix][headless]Fix getModelList filter issue. --- .../tencent/supersonic/headless/api/pojo/MetaFilter.java | 2 ++ .../persistence/repository/impl/ModelRepositoryImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java index 22dce4506..b71cca0e2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetaFilter.java @@ -34,6 +34,8 @@ public class MetaFilter { private List names; + private List bizNames; + private List fieldsDepend; private Integer isTag; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ModelRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ModelRepositoryImpl.java index 8d481e92a..4a3eb3c39 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ModelRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/ModelRepositoryImpl.java @@ -54,6 +54,12 @@ public class ModelRepositoryImpl implements ModelRepository { if (!CollectionUtils.isEmpty(modelFilter.getModelIds())) { wrapper.lambda().in(ModelDO::getId, modelFilter.getModelIds()); } + if (!CollectionUtils.isEmpty(modelFilter.getNames())) { + wrapper.lambda().in(ModelDO::getName, modelFilter.getNames()); + } + if (!CollectionUtils.isEmpty(modelFilter.getBizNames())) { + wrapper.lambda().in(ModelDO::getBizName, modelFilter.getBizNames()); + } if (modelFilter.getIncludesDetail() != null && !modelFilter.getIncludesDetail()) { wrapper.select(ModelDO.class, modelDO -> !modelDO.getColumn().equals("model_detail")); }