From c01f7e67eab7fca534009a380f6efad190344bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Sun, 26 Sep 2021 10:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E6=8F=90?=
 =?UTF-8?q?=E6=8A=A5bug=EF=BC=8C=EF=BC=88=E4=BB=8E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=82=B9=E6=A3=80=E8=B7=B3=E8=BF=87=E6=9D=A5object=E4=B9=9F?=
 =?UTF-8?q?=E6=9C=89=E5=8F=AF=E8=83=BD=E4=B8=8D=E4=B8=BA=E7=A9=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 d7e4daa3..e265342a 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
@@ -172,7 +172,7 @@ public class ResourceRepairTaskController {
         try{
             resourceRepairTaskService.saveRepairTask(resourceRepairTask);
         }catch (Exception e){
-            return R.failed("提报失败，"+e.getMessage());
+            return R.failed("提报失败:"+e.getMessage());
         }
         return R.ok();
     }
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 4fcda511..3687afe2 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
@@ -15,7 +15,6 @@ import com.foreverwin.mesnac.equip.model.ResourceRepairTask;
 import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService;
 import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService;
 import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService;
-import com.foreverwin.mesnac.meapi.dto.NcCodeDto;
 import com.foreverwin.mesnac.meapi.mapper.NcCodeMapper;
 import com.foreverwin.mesnac.meapi.mapper.NwaUserMapper;
 import com.foreverwin.mesnac.meapi.model.DataField;
@@ -27,8 +26,8 @@ import com.foreverwin.mesnac.meapi.service.ResrceService;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -149,7 +148,7 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
         }
         //调用方法，关闭异常单的状态
         String objectBo = resourceRepairTask.getObjectBo();
-        if (objectBo != null){
+        if (StringUtils.isNotBlank(objectBo)){
             anomalyService.anomalyReveseRepairShutDown(objectBo);
         }