试验bug

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -4369,7 +4369,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             String loadDataId = jsonObject.getString("loadDataId");
 
-            if (loadDataId != null && Func.isNotEmpty(loadDataId)) {
+            if (loadDataId != null && Func.isNotEmpty(loadDataId)&&!loadDataId.equals("null")&&!loadDataId.equals("")) {
 
                 String pkeyId = jsonObject.getString("pkeyId");
                 String projectId = jsonObject.getString("projectId");
@@ -4726,7 +4726,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         setFirstData(doc,"设计强度等级",sampleInfo.getDesignStrength(),reData,isCancel,isCancelList);
         setFirstData(doc,"用途（使用在何工程部位）",sampleInfo.getProposedPosition(),reData,isCancel,isCancelList);
         setFirstData(doc,"成型日期",null,reData,isCancel,isCancelList);
-        setFirstData(doc,"试件编号",sampleInfo.getSpecificationNumber(),reData,isCancel,isCancelList);
+       // setFirstData(doc,"试件编号",sampleInfo.getSpecificationNumber(),reData,isCancel,isCancelList);
         setFirstData(doc,"进场日期代表数量",format+"/"+representativeCount+calculationUnit,reData,isCancel,isCancelList);
         setFirstData(doc,"材料进场日期",format,reData,isCancel,isCancelList);