From c2a3f632f6690bbc36c080388353167b6aed2dcd Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 19 Sep 2024 16:37:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E8=B7=AF=E5=BE=84=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dataset/manage/DatasetGroupManage.java | 3 +++ .../src/main/java/io/dataease/utils/CommonThreadPool.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 d7cec6ff26..dd92d91959 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 @@ -561,6 +561,9 @@ public class DatasetGroupManage { public void geFullName(Long pid, List fullName) { CoreDatasetGroup parent = coreDatasetGroupMapper.selectById(pid);// 查找父级folder + if (parent == null) { + return; + } fullName.add(parent.getName()); if (parent.getPid() != null && parent.getPid() != 0) { geFullName(parent.getPid(), fullName); diff --git a/sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java b/sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java index 17f9c30a7c..829a8788da 100644 --- a/sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java +++ b/sdk/common/src/main/java/io/dataease/utils/CommonThreadPool.java @@ -24,7 +24,7 @@ public class CommonThreadPool { @PostConstruct public void init() { scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(corePoolSize); - scheduledThreadPoolExecutor.setMaximumPoolSize(maximumPoolSize); + scheduledThreadPoolExecutor.setMaximumPoolSize(corePoolSize); scheduledThreadPoolExecutor.setKeepAliveTime(keepAliveSeconds, TimeUnit.SECONDS); }