From db091ffb171a7a6b39e3f47a52171710ca582fb1 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Sat, 9 Oct 2021 13:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E7=BA=A0=E6=AD=A3?=
 =?UTF-8?q?=E9=A2=84=E9=98=B2=E6=9F=A5=E8=AF=A2=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E7=BB=B4=E4=BF=AE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/equip/controller/ResourceRepairTaskController.java  | 2 +-
 .../equip/service/impl/ResourceRepairTaskServiceImpl.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java
index e265342a..0162a2b8 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java
@@ -248,7 +248,7 @@ public class ResourceRepairTaskController {
         try {
             return R.ok(resourceRepairTaskService.findResourceRepairTaskByHandleAndSite(site,handle));
         }catch (Exception e){
-            return R.failed(""+e.getMessage());
+            return R.failed("查询失败："+e.getMessage());
         }
     }
 
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index 2b4293b1..2fee846c 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
@@ -326,6 +326,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
     @Override
     public ResourceRepairTask findResourceRepairTaskByHandleAndSite(String site, String handle) {
         ResourceRepairTask repairTask = resourceRepairTaskMapper.findResourceRepairTaskByHandleAndSite(site, handle);
+        if (repairTask == null){
+            throw BusinessException.build("未找到维修单数据！");
+        }
         // 耗用备品
         ResourceInspectTaskSpare taskSpare = new ResourceInspectTaskSpare();
         taskSpare.setResourceInspectTaskBo(handle);