Merge remote-tracking branch 'mesnac/master'

3 years ago · 05a02ed17c
parent 08b6acf0c4 cbcddfe3ba
commit 05a02ed17c
1 changed files with 3 additions and 1 deletions
--- 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("")){