diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 53f01642..70493378 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -861,6 +861,10 @@ public class PHDFileUtil extends AbstractLogOrReport { path.append("Spectrum"); path.append(StringPool.SLASH+"Xenon"); path.append(StringPool.SLASH+"Spalax"); + } else if (systemType.contains("C")) { + path.append("Spectrum"); + path.append(StringPool.SLASH+"Xenon"); + path.append(StringPool.SLASH+"Self"); } if(dataType.contains("SAMPLEPHD")) { path.append(StringPool.SLASH+"Samplephd"); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java index c991684b..bf99e2a5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java @@ -4984,9 +4984,11 @@ public class SelfStationServiceImpl implements ISelfStationService { result.error500("sampleFile save failed"); return result; } - if (!this.OriginalDataStore(detStruct, detTmpPath, detFilePathName) ){ - result.error500("detFile save failed"); - return result; + if (StrUtil.isNotBlank(detFilePathName)){ + if (!this.OriginalDataStore(detStruct, detTmpPath, detFilePathName) ){ + result.error500("detFile save failed"); + return result; + } } if (StringUtils.isNotBlank(qcFilePathName)) { if (!this.OriginalDataStore(qcStruct, qcTmpPath, qcFilePathName) ){