github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 03:22:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 【桌面版】根目录下可创建重名数据源，下级目录限制正常

Browse Source
This commit is contained in:
taojinlong 2025-01-07 10:42:19 +08:00 committed by taojinlong
parent 59bc6df229
commit 2482a36385
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
View File

@ -19,10 +19,7 @@ import io.dataease.license.config.XpackInteract;
import io.dataease.model.BusiNodeRequest; import io.dataease.model.BusiNodeRequest;
import io.dataease.model.BusiNodeVO; import io.dataease.model.BusiNodeVO;
import io.dataease.operation.manage.CoreOptRecentManage; import io.dataease.operation.manage.CoreOptRecentManage;
import io.dataease.utils.AuthUtils; import io.dataease.utils.*;
import io.dataease.utils.BeanUtils;
import io.dataease.utils.CommunityUtils;
import io.dataease.utils.TreeUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
@ -98,7 +95,7 @@ public class DataSourceManage {
public void checkName(DatasourceDTO dto) { public void checkName(DatasourceDTO dto) {
QueryWrapper<CoreDatasource> wrapper = new QueryWrapper<>(); QueryWrapper<CoreDatasource> wrapper = new QueryWrapper<>();
if (ObjectUtils.isNotEmpty(dto.getPid())) { if (ObjectUtils.isNotEmpty(dto.getPid())) {
wrapper.eq("pid", dto.getPid().equals(0L) ? AuthUtils.getUser().getDefaultOid() : dto.getPid()); wrapper.eq("pid", dto.getPid());
} }
if (StringUtils.isNotEmpty(dto.getName())) { if (StringUtils.isNotEmpty(dto.getName())) {
wrapper.eq("name", dto.getName()); wrapper.eq("name", dto.getName());