diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java index 44b7965d77..13b3b32f26 100644 --- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java +++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java @@ -8,6 +8,7 @@ import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO; import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.i18n.Translator; +import io.dataease.license.utils.LicenseUtil; import io.dataease.utils.JsonUtil; import net.sf.jsqlparser.expression.*; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; @@ -548,7 +549,7 @@ public class SqlparserUtils { prefix = datasourceType.getPrefix(); suffix = datasourceType.getSuffix(); } else { - if (pluginManage != null) { + if (LicenseUtil.licenseValid()) { List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), value.getType())).toList(); if (ObjectUtils.isNotEmpty(list)) { diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java index 9feac047cd..8e9163a555 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java @@ -26,6 +26,7 @@ import io.dataease.extensions.view.dto.ChartExtFilterDTO; import io.dataease.extensions.view.dto.ChartExtRequest; import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.i18n.Translator; +import io.dataease.license.utils.LicenseUtil; import io.dataease.system.manage.CorePermissionManage; import io.dataease.utils.BeanUtils; import io.dataease.utils.JsonUtil; @@ -374,7 +375,7 @@ public class DatasetSQLManage { BeanUtils.copyBean(dto, datasourceType); return dto; } else { - if (pluginManage != null) { + if (LicenseUtil.licenseValid()) { List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); List list = xpackPluginsDatasourceVOS.stream().filter(ele -> StringUtils.equals(ele.getType(), type)).toList(); if (ObjectUtils.isNotEmpty(list)) { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 11b1ee47b8..8db4b316a6 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -859,7 +859,7 @@ public class DatasourceServer implements DatasourceApi { private void preCheckDs(DatasourceDTO datasource) throws DEException { List list = datasourceTypes().stream().map(DatasourceConfiguration.DatasourceType::getType).collect(Collectors.toList()); - if (pluginManage != null) { + if (LicenseUtil.licenseValid()) { List xpackPluginsDatasourceVOS = pluginManage.queryPluginDs(); xpackPluginsDatasourceVOS.forEach(ele -> list.add(ele.getType())); }