From 2b345294944d229a89dfb01b7b7179d5b4a945df Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 4 Apr 2023 14:08:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E8=A1=A8=E6=8A=8A=E7=82=B9=E4=BD=8D=E7=B1=BB=E5=9E=8B=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=82=B9=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/sch/service/impl/PointServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index c0b798d3..5040ef37 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -69,7 +69,7 @@ public class PointServiceImpl implements PointService { String point_status_explain = ObjectUtil.isNotEmpty(regionDto.getPoint_status_explain())?regionDto.getPoint_status_explain():null; String point_type_explain = ObjectUtil.isNotEmpty(regionDto.getPoint_type_explain())?regionDto.getPoint_type_explain():null; // 获取点位状态名称 - if (ObjectUtil.isNotEmpty(point_status)) { + if (ObjectUtil.isNotEmpty(point_status) && ObjectUtil.isNotEmpty(point_status_explain)) { JSONObject statusArr = new JSONObject(); String[] split = point_status_explain.split("，"); for ( int j = 0; j < split.length; j++) { @@ -79,7 +79,7 @@ public class PointServiceImpl implements PointService { object.put("point_status_name", statusArr.getString(point_status)); } // 获取点位类型 - if (ObjectUtil.isNotEmpty(point_type)) { + if (ObjectUtil.isNotEmpty(point_type) && ObjectUtil.isNotEmpty(point_type_explain)) { JSONObject typeArr = new JSONObject(); String[] split = point_type_explain.split("，"); for ( int j = 0; j < split.length; j++) {