From 146638c6a38edf3b968c297ae5c9a826ce96421d Mon Sep 17 00:00:00 2001 From: qiuyt Date: Tue, 8 Apr 2025 12:24:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8D=95=E5=8F=B7=20?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/collect/IoCollectOrderController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index ccf1d77e5..b6b2c5b4b 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -36,6 +36,7 @@ import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.util.Excel.ExcelHandler; import com.glxp.api.util.Excel.Exception.RenException; import com.glxp.api.util.IntUtil; +import com.glxp.api.util.StringUtils; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -214,7 +215,7 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.error(500, "未找到单据"); } //如果是 处理单据页面来的 有汇总单号 要走汇总单号 - if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())) { + if (collectOrderBizRequest.getSummaryNoFlag() !=null &&collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())) { collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo()); } List list = collectOrderBizService.filterList(collectOrderBizRequest);