diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
index 7397f10d..c5ab2615 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisServiceImpl.java
@@ -1320,7 +1320,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 						//查询当前分析方法下对应的任务
         				List<BusinessAssayTaskDataDO> targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessBaseSampleIdsAndMethodKey(businessBaseSampleIdList, methodKey);
         				List<Long> targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
-        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = new ArrayList<>();
+        				if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {//如果当前分析下存在任务
+        					targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+						}
         				
         				for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) {
         					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
@@ -1348,7 +1351,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 						//查询当前分析方法下对应的任务
         				List<BusinessAssayTaskDataDO> targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey);
         				List<Long> targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
-        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = new ArrayList<>(); 
+        				if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {
+        					targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+						}
         				
         				for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) {
         					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
@@ -1376,7 +1382,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 						//查询当前分析方法下对应的任务
         				List<BusinessAssayTaskDataDO> targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey);
         				List<Long> targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
-        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = new ArrayList<>();
+        				if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {
+        					targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+						}
         				
         				for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) {
         					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java
index 3c9045e2..e4a228e6 100644
--- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java
+++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/XRFDataServiceImpl.java
@@ -390,7 +390,10 @@ public class XRFDataServiceImpl implements XRFDataService {
 									//查询当前分析方法下对应的任务
 			        				List<BusinessAssayTaskDataDO> targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessBaseSampleIdsAndMethodKey(businessBaseSampleIdList, methodKey);
 			        				List<Long> targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
-			        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+			        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = new ArrayList<>();
+			        				if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {
+			        					targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+									}
 			        				
 			        				for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) {
 			        					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
@@ -418,7 +421,10 @@ public class XRFDataServiceImpl implements XRFDataService {
 									//查询当前分析方法下对应的任务
 			        				List<BusinessAssayTaskDataDO> targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey);
 			        				List<Long> targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
-			        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+			        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = new ArrayList<>();
+			        				if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {
+			        					targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+									}
 			        				
 			        				for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) {
 			        					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();
@@ -446,7 +452,10 @@ public class XRFDataServiceImpl implements XRFDataService {
 									//查询当前分析方法下对应的任务
 			        				List<BusinessAssayTaskDataDO> targetBusinessAssayTaskDataList = businessAssayTaskDataMapper.selectByBusinessSubSampleIdAndMethodKey(businessAssayTaskData.getBusinessSubSampleId(), methodKey);
 			        				List<Long> targetBusinessAssayTaskDataIdList = targetBusinessAssayTaskDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
-			        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+			        				List<BusinessAssayProjectDataExtendRespVO> targetBusinessAssayProjectDataExtendList = new ArrayList<>() ;
+			        				if (CollUtil.isNotEmpty(targetBusinessAssayTaskDataIdList)) {
+			        					targetBusinessAssayProjectDataExtendList = businessAssayProjectDataMapper.selectByBusinessAssayTaskDataIds(targetBusinessAssayTaskDataIdList);
+									}
 			        				
 			        				for (ConfigSubSampleMethodConfItem configSubSampleMethodConfItem : setParamList) {
 			        					ConfigSubSampleMethodConfPoint source = configSubSampleMethodConfItem.getSource();