From 7d221b0accb1d235e00e1421831826085992d737 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 27 Aug 2024 15:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InspectionRecordServiceImpl.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionRecordServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionRecordServiceImpl.java
index c630eec..3c22010 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionRecordServiceImpl.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionRecordServiceImpl.java
@@ -5,6 +5,7 @@ package org.springblade.lims.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -35,10 +36,14 @@ public class InspectionRecordServiceImpl extends BaseServiceImpl<InspectionRecor
         wrapper.eq(BaseEntity::getIsDeleted, 0);
         wrapper.orderByDesc(InspectionRecord::getCreateTime);
         IPage<InspectionRecord> page = this.page(Condition.getPage(query), wrapper);
-        page.getRecords().forEach(record ->{
-            Instrument instrument = instrumentService.getById(record.getAssetId());
-            record.setAssetName(instrument.getName());
-        });
+        if(CollectionUtils.isNotEmpty(page.getRecords())){
+            page.getRecords().forEach(record ->{
+                Instrument instrument = instrumentService.getById(record.getAssetId());
+                if(instrument != null){
+                    record.setAssetName(instrument.getName());
+                }
+            });
+        }
         return page;
     }