diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java index 7461784..c5ac761 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/spot/MesSpotCheckOrderController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.spot.IMesSpotCheckOrderService; import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSpotCheckOrderModel; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentSpotCheck; import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrder; import cn.estsh.impp.framework.boot.auth.AuthUtil; @@ -111,7 +112,7 @@ public class MesSpotCheckOrderController { try { - if (StringUtils.isEmpty(model.getSpotCheckOrder())) { + if (StringUtils.isEmpty(model.getSpotCheckOrder()) || StringUtil.isEmpty(model.getSpotCheckOrder().getId())) { throw new ImppBusiException("点检单不能为空"); } if (StringUtils.isEmpty(model.getProduceSn())) { @@ -135,7 +136,7 @@ public class MesSpotCheckOrderController { try { - if (StringUtils.isEmpty(model.getSpotCheckOrder())) { + if (StringUtils.isEmpty(model.getSpotCheckOrder())|| StringUtil.isEmpty(model.getSpotCheckOrder().getId())) { throw new ImppBusiException("点检单不能为空"); } if (CollectionUtils.isEmpty(model.getOrderResultList())) { @@ -155,7 +156,7 @@ public class MesSpotCheckOrderController { try { - if (StringUtils.isEmpty(model.getSpotCheckOrder())) { + if (StringUtils.isEmpty(model.getSpotCheckOrder()) || StringUtil.isEmpty(model.getSpotCheckOrder().getId())) { throw new ImppBusiException("点检单不能为空"); } @@ -178,7 +179,7 @@ public class MesSpotCheckOrderController { try { - if (StringUtils.isEmpty(model.getSpotCheckOrder().getId())) { + if (StringUtils.isEmpty(model.getSpotCheckOrder()) || StringUtils.isEmpty(model.getSpotCheckOrder().getId())) { throw new ImppBusiException("点检单不能为空"); }