From 04038864f071e2153a8e140879bb62498ce72932 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Mon, 27 Sep 2021 16:36:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9Ednc=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E6=94=B6=E8=AE=BE=E5=A4=87=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=95=BF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
index 92385681..5631846f 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
@@ -82,8 +82,8 @@ public class ResourceRunTimeServiceImpl extends ServiceImpl<ResourceRunTimeMappe
             resourceRunTime.setSendDate(dateDay);
 
             JSONObject jsonObj = (JSONObject) jsonArray.get(i);
-            String runTime = jsonObj.getString("RUN_TIME");
-            String resource = jsonObj.getString("RESOURCE");
+            String runTime = jsonObj.getString("rUN_TIME");
+            String resource = jsonObj.getString("rESOURCE");
             resourceRunTime.setRunTime(Double.valueOf(runTime));
             resourceRunTime.setResrce(resource);
             resourceRunTime.setHandle(UUID.randomUUID().toString());

From 0fa5a93bb9e596c377643f7698dc2bc46e441cba Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 28 Sep 2021 13:09:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?dnc=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BC=96=E5=8F=B7=E5=92=8C=E8=BF=90=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
index 5631846f..92385681 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRunTimeServiceImpl.java
@@ -82,8 +82,8 @@ public class ResourceRunTimeServiceImpl extends ServiceImpl<ResourceRunTimeMappe
             resourceRunTime.setSendDate(dateDay);
 
             JSONObject jsonObj = (JSONObject) jsonArray.get(i);
-            String runTime = jsonObj.getString("rUN_TIME");
-            String resource = jsonObj.getString("rESOURCE");
+            String runTime = jsonObj.getString("RUN_TIME");
+            String resource = jsonObj.getString("RESOURCE");
             resourceRunTime.setRunTime(Double.valueOf(runTime));
             resourceRunTime.setResrce(resource);
             resourceRunTime.setHandle(UUID.randomUUID().toString());

From cbcddfe3ba7b83695316402af89917b84f0fcc02 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 28 Sep 2021 13:09:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E8=80=97=E7=94=A8=E5=A4=87=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/service/impl/ResourceRepairTaskServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 3687afe2..2b4293b1 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
@@ -330,7 +330,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
         ResourceInspectTaskSpare taskSpare = new ResourceInspectTaskSpare();
         taskSpare.setResourceInspectTaskBo(handle);
         List<ResourceInspectTaskSpare> spareList = resourceInspectTaskSpareService.selectList(taskSpare);
-        repairTask.setSpareList(spareList);
+        if (spareList != null && spareList.size() > 0){
+            repairTask.setSpareList(spareList);
+        }
         // 维修用户的中文名称
         String repairUsers = repairTask.getRepairUsers();
         if (repairUsers != null && !repairUsers.equals("")){