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<String> 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);
     }