From 87b252513c08659428aa443623275c37f0abbe1b Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 26 Jun 2024 15:09:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=8D=E8=83=BD=E8=B7=A8=E7=BB=84=E7=BB=87=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=90=8C=E5=90=8D=E6=95=B0=E6=8D=AE=E9=9B=86=E5=92=8C?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/manage/DatasetGroupManage.java | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java index fdbc1cf52e..8bf0ea024a 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java @@ -3,7 +3,6 @@ package io.dataease.dataset.manage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import io.dataease.api.dataset.dto.DatasetTableDTO; -import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.api.dataset.union.DatasetGroupInfoDTO; import io.dataease.api.dataset.union.UnionDTO; import io.dataease.api.dataset.vo.DataSetBarVO; @@ -20,11 +19,13 @@ import io.dataease.dataset.utils.FieldUtils; import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.dao.auto.entity.CoreDatasource; import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper; -import io.dataease.extensions.view.dto.DatasetTableFieldDTO; import io.dataease.engine.constant.ExtFieldConstant; import io.dataease.exception.DEException; +import io.dataease.extensions.view.dto.DatasetTableFieldDTO; +import io.dataease.extensions.view.dto.SqlVariableDetails; import io.dataease.i18n.Translator; import io.dataease.license.config.XpackInteract; +import io.dataease.license.utils.LicenseUtil; import io.dataease.model.BusiNodeRequest; import io.dataease.model.BusiNodeVO; import io.dataease.operation.manage.CoreOptRecentManage; @@ -264,25 +265,27 @@ public class DatasetGroupManage { } public void checkName(DatasetGroupInfoDTO dto) { - QueryWrapper wrapper = new QueryWrapper<>(); - if (ObjectUtils.isNotEmpty(dto.getPid())) { - wrapper.eq("pid", dto.getPid()); - } - if (StringUtils.isNotEmpty(dto.getName())) { - wrapper.eq("name", dto.getName()); - } - if (ObjectUtils.isNotEmpty(dto.getId())) { - wrapper.ne("id", dto.getId()); - } - if (ObjectUtils.isNotEmpty(dto.getLevel())) { - wrapper.eq("level", dto.getLevel()); - } - if (ObjectUtils.isNotEmpty(dto.getNodeType())) { - wrapper.eq("node_type", dto.getNodeType()); - } - List list = coreDatasetGroupMapper.selectList(wrapper); - if (list.size() > 0) { - DEException.throwException(Translator.get("i18n_ds_name_exists")); + if (!LicenseUtil.licenseValid()) { + QueryWrapper wrapper = new QueryWrapper<>(); + if (ObjectUtils.isNotEmpty(dto.getPid())) { + wrapper.eq("pid", dto.getPid()); + } + if (StringUtils.isNotEmpty(dto.getName())) { + wrapper.eq("name", dto.getName()); + } + if (ObjectUtils.isNotEmpty(dto.getId())) { + wrapper.ne("id", dto.getId()); + } + if (ObjectUtils.isNotEmpty(dto.getLevel())) { + wrapper.eq("level", dto.getLevel()); + } + if (ObjectUtils.isNotEmpty(dto.getNodeType())) { + wrapper.eq("node_type", dto.getNodeType()); + } + List list = coreDatasetGroupMapper.selectList(wrapper); + if (list.size() > 0) { + DEException.throwException(Translator.get("i18n_ds_name_exists")); + } } }