From d99f4dd443eadb548ccd87e3c8ca9e5049e1f311 Mon Sep 17 00:00:00 2001 From: wxr Date: Thu, 9 Apr 2026 11:15:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E9=85=8D=E7=BD=AE=E5=AD=90=E6=A0=B7?= =?UTF-8?q?=E4=B8=8E=E6=96=B9=E6=B3=95=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/service/BusinessAssayTaskDataServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java index cfc37a5b..d421423e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessAssayTaskDataServiceImpl.java @@ -149,8 +149,8 @@ public class BusinessAssayTaskDataServiceImpl implements BusinessAssayTaskDataSe for (BusinessAssayTaskDataExtendRespVO businessAssayTaskData : list) { ConfigSubSampleMethodExtendRespVO configSubSampleMethod = configSubSampleMethodList.stream().filter(f -> f.getConfigSubSampleId().equals(businessAssayTaskData.getConfigSubSampleId()) && f.getConfigAssayMethodId().equals(businessAssayTaskData.getConfigAssayMethodId())).findFirst().orElse(null); - String configInfomation = configSubSampleMethod.getConfigInfomation(); - if (StringUtils.isNotBlank(configInfomation)) { + if (configSubSampleMethod != null && StringUtils.isNotBlank(configSubSampleMethod.getConfigInfomation())) { + String configInfomation = configSubSampleMethod.getConfigInfomation(); ConfigSubSampleMethodConfInfo configSubSampleMethodConfInfo = JSON.parseObject(configInfomation, ConfigSubSampleMethodConfInfo.class); List getParamList = configSubSampleMethodConfInfo.getGetParam(); StringBuilder ingredientInfoBuilder = new StringBuilder(); @@ -217,8 +217,9 @@ public class BusinessAssayTaskDataServiceImpl implements BusinessAssayTaskDataSe for (BusinessAssayTaskDataExtendRespVO businessAssayTaskData : list) { ConfigSubSampleMethodExtendRespVO configSubSampleMethod = configSubSampleMethodList.stream().filter(f -> f.getConfigSubSampleId().equals(businessAssayTaskData.getConfigSubSampleId()) && f.getConfigAssayMethodId().equals(businessAssayTaskData.getConfigAssayMethodId())).findFirst().orElse(null); - String configInfomation = configSubSampleMethod.getConfigInfomation(); - if (StringUtils.isNotBlank(configInfomation)) { + + if (configSubSampleMethod != null && StringUtils.isNotBlank(configSubSampleMethod.getConfigInfomation())) { + String configInfomation = configSubSampleMethod.getConfigInfomation(); ConfigSubSampleMethodConfInfo configSubSampleMethodConfInfo = JSON.parseObject(configInfomation, ConfigSubSampleMethodConfInfo.class); List getParamList = configSubSampleMethodConfInfo.getGetParam(); StringBuilder ingredientInfoBuilder = new StringBuilder();