Merge 23024f1 into d5f99cc

Radeity · web-flow · commit a002ecce1357 · 2023-11-01T15:02:56.000+08:00
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
@@ -612,10 +612,12 @@ private List<StorageEntity> queryStorageEntityList(User loginUser, String fullNa
 
             try {
                 if (StringUtils.isBlank(fullName)) {
-                    resourcesList = storageOperate.listFilesStatus(defaultPath, defaultPath, tenantCode, type);
-                } else {
-                    resourcesList = storageOperate.listFilesStatus(fullName, defaultPath, tenantCode, type);
+                    fullName = defaultPath;
                 }
+                resourcesList = recursive ? storageOperate.listFilesStatusRecursively(fullName, defaultPath,
+                        tenantCode, type)
+                        : storageOperate.listFilesStatus(fullName, defaultPath,
+                                tenantCode, type);
             } catch (Exception e) {
                 log.error(e.getMessage() + " Resource path: {}", fullName, e);
                 throw new ServiceException(String.format(e.getMessage() +
