ai

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java

@@ -68,7 +68,7 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
             // 先校验数据
             ValidatorUtils.validateEntity(data);
 
-            if ((null == data.getSampleTime() && null == data.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(data.getNatResultZh()))){
+            if (null == data.getSampleTime() && (null == data.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(data.getNatResultZh()))){
                 throw new EpmetException(EpmetErrorCode.SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR.getCode());
             }
             if(null != data.getSampleTime() && org.apache.commons.lang3.StringUtils.isNotBlank(data.getNatResultZh()) && null == data.getNatTime()){