From 4ee5ca4f54fb85fa4ec75eb3d969a037bb3cfd9c Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 19 Dec 2023 10:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java index dddcf54..b287ed9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java @@ -1096,9 +1096,9 @@ public class WorkOrderExtService implements IWorkOrderExtService { MesWorkCenterExt workCenterExt = workCenterCodeMap.get(workOrderPageVo.getWorkCenterCode()); - workOrderPageVo.setWorkCenterName(workCenterExt.getWorkCenterName()); + workOrderPageVo.setWorkCenterName(workCenterExt == null ? "" :workCenterExt.getWorkCenterName()); - workOrderPageVo.setIsNoumenon(workCenterExt.getLineType().equals(String.valueOf(MesExtEnumUtil.LINE_TYPE.ONTOLOGY_LINE.getValue())) ? MesExtEnumUtil.YES_OR_NO.YES.getValue() : MesExtEnumUtil.YES_OR_NO.NO.getValue()); + workOrderPageVo.setIsNoumenon(workCenterExt == null ? MesExtEnumUtil.YES_OR_NO.YES.getValue() : workCenterExt.getLineType().equals(String.valueOf(MesExtEnumUtil.LINE_TYPE.ONTOLOGY_LINE.getValue())) ? MesExtEnumUtil.YES_OR_NO.YES.getValue() : MesExtEnumUtil.YES_OR_NO.NO.getValue()); }