From b4e26ddabbdb6483ad645e8a060a3ea8bdd7f4a7 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 1 Feb 2024 20:26:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsAssessServiceImpl.java   | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
index 44c9adff..a5e43c69 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
@@ -170,29 +170,33 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
 			if (CommonConstant.STANDARD_SOURCE_1.equals(source)){
 				//查询国内标准数据，赋值给collection
 				LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
-				assess.setStandardEnglishName(standard.getStandardEnglishName());
-				assess.setStandardState(standard.getStandardState());
-				assess.setApplicableVehicle(standard.getApplicableVehicle());
-				assess.setOnTheProductionDate(standard.getOnTheProductionDate());
-				assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
-				assess.setReleaseDate(standard.getReleaseDate());
-				//TODO "这里要用额外方法查询"
-				//assess.setAssessResults("-");
-				assess.setResponsibleDepartment(standard.getResponsibleDepartment());
+				if (standard != null){
+					assess.setStandardEnglishName(standard.getStandardEnglishName());
+					assess.setStandardState(standard.getStandardState());
+					assess.setApplicableVehicle(standard.getApplicableVehicle());
+					assess.setOnTheProductionDate(standard.getOnTheProductionDate());
+					assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
+					assess.setReleaseDate(standard.getReleaseDate());
+					//TODO "这里要用额外方法查询"
+					//assess.setAssessResults("-");
+					assess.setResponsibleDepartment(standard.getResponsibleDepartment());
+				}
 
 			}
 			if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
 				//查询海外标准数据，赋值给collection
 				LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
-				assess.setStandardEnglishName(standard.getStandardEnglishName());
-				assess.setStandardState(standard.getStandardState());
-				assess.setApplicableVehicle(standard.getApplicableVehicle());
-				assess.setOnTheProductionDate(standard.getOnTheProductionDate());
-				assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
-				assess.setReleaseDate(standard.getReleaseDate());
-				//TODO "这里要用额外方法查询"
-				//assess.setAssessResults("-");
-				assess.setResponsibleDepartment(standard.getResponsibleDepartment());
+				if (standard != null){
+					assess.setStandardEnglishName(standard.getStandardEnglishName());
+					assess.setStandardState(standard.getStandardState());
+					assess.setApplicableVehicle(standard.getApplicableVehicle());
+					assess.setOnTheProductionDate(standard.getOnTheProductionDate());
+					assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
+					assess.setReleaseDate(standard.getReleaseDate());
+					//TODO "这里要用额外方法查询"
+					//assess.setAssessResults("-");
+					assess.setResponsibleDepartment(standard.getResponsibleDepartment());
+				}
 			}
 			String assessResults = assess.getAssessResults();
 			if (StringUtils.isBlank(assessResults)){