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);