From f4fff048aa6e2a90529bed0232a1982c200a0eb9 Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Wed, 24 Apr 2024 17:41:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=84=E7=90=86=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BAnull=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/service/dao/SortingLineRes.java   | 19 +++++++++++++++++++
 .../service/impl/CockpitServiceImpl.java      |  6 ++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java
index 35a6134..6c6dd6b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/SortingLineRes.java
@@ -1,7 +1,10 @@
 package org.nl.wms.cockpit.service.dao;
 
+import cn.hutool.core.util.ObjectUtil;
+import jodd.util.StringUtil;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -13,4 +16,20 @@ public class SortingLineRes {
     private List<RgSortingLineVo> rgSortingLine;
     private String rgPlanQty;
     private String rgRealQty;
+
+    public List<SortingLineVo> getSortingLines() {
+        return ObjectUtil.isEmpty(sortingLines) ? new ArrayList<>() : sortingLines;
+    }
+
+    public List<RgSortingLineVo> getRgSortingLine() {
+        return ObjectUtil.isEmpty(rgSortingLine) ? new ArrayList<>() : rgSortingLine;
+    }
+
+    public String getRgPlanQty() {
+        return StringUtil.isEmpty(rgPlanQty) ? "0" : rgPlanQty;
+    }
+
+    public String getRgRealQty() {
+        return StringUtil.isEmpty(rgRealQty) ? "0" : rgRealQty;
+    }
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
index 0c9f3e8..9ec7902 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/impl/CockpitServiceImpl.java
@@ -120,8 +120,10 @@ public class CockpitServiceImpl implements CockpitService {
                     List<SortingLineVo> sortingLine = cockPitMapper.getSortingLine();
                     List<RgSortingLineVo> rgSortingLine = cockPitMapper.getRgSortingLineVo();
                     SortingLineRes sortCount = cockPitMapper.selectRgSortCount();
-                    res.setRgRealQty(sortCount.getRgRealQty());
-                    res.setRgPlanQty(sortCount.getRgPlanQty());
+                    if (null != sortCount) {
+                        res.setRgRealQty(sortCount.getRgRealQty());
+                        res.setRgPlanQty(sortCount.getRgPlanQty());
+                    }
                     res.setRgSortingLine(rgSortingLine);
                     res.setSortingLines(sortingLine);
                     return res;