diff --git a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java index 763ec21c..12fca242 100644 --- a/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java +++ b/data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java @@ -62,7 +62,7 @@ public class DataStorageAnalysisController { return SdmResponse.success(result); } catch (Exception e) { log.error("获取文件空间占用失败", e); - return SdmResponse.failed("获取文件空间占用失败"); + return SdmResponse.success(); } } diff --git a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java index c4a13894..e6c934a7 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java @@ -69,7 +69,8 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { SdmResponse> response = simuluationNodeFeignClient.getAllNodeByProjectIdAndType(uuid, queryNodeType); Long tenantId = ThreadLocalContext.getTenantId(); if (!response.isSuccess()) { - return SdmResponse.failed("获取节点信息失败"); + log.error("获取节点信息失败"); + return SdmResponse.success(); } List nodeLists = response.getData(); @@ -92,7 +93,8 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { .eq(FileMetadataInfo::getTenantId, tenantId) .list().stream().collect(Collectors.toMap(FileMetadataInfo::getRelatedResourceUuid, FileMetadataInfo::getId)); if (CollectionUtils.isEmpty(uuidToDirIdMap)) { - return SdmResponse.failed("获取节点信息失败"); + log.error("获取节点信息失败"); + return SdmResponse.success(); } // fileMetadIds: uuid对应的fileid结合 @@ -136,8 +138,6 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { }); } - - return SdmResponse.success(result); } diff --git a/flowable/repomix-output.xml b/flowable/repomix-output.xml index 0bfc2bd0..06fb372a 100644 --- a/flowable/repomix-output.xml +++ b/flowable/repomix-output.xml @@ -1011,6 +1011,7 @@ package com.sdm.flowable.delegate.handler; import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; +import com.sdm.common.common.ThreadLocalContext; import com.sdm.common.entity.flowable.executeConfig.ExportWordScriptExecuteConfig; import com.sdm.common.entity.req.data.GetFileBaseInfoReq; import com.sdm.common.entity.req.data.UploadFilesReq; @@ -1070,8 +1071,14 @@ public class ExportWordScriptHandler implements ExecutionHandler