From 621c9f41155573ac856a60eca7b3b6478477a20b Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 8 Apr 2025 09:33:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B1=87=E6=80=BB=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderController.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) 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 f36b528bb..8445b2423 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -214,22 +214,15 @@ public class IoCollectOrderController extends BaseController { return ResultVOUtils.error(500, "未找到单据"); } //如果是 处理单据页面来的 有汇总单号 要走汇总单号 - if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())){ + if (collectOrderBizRequest.getSummaryNoFlag() && StrUtil.isNotEmpty(collectOrder.getSummaryNo())) { collectOrderBizRequest.setSummaryNo(collectOrder.getSummaryNo()); - List list = collectOrderBizService.filterList(collectOrderBizRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(list); - return ResultVOUtils.success(pageSimpleResponse); - }else { - List list = collectOrderBizService.filterList(collectOrderBizRequest); - PageInfo pageInfo = new PageInfo<>(list); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(list); - return ResultVOUtils.success(pageSimpleResponse); } + List list = collectOrderBizService.filterList(collectOrderBizRequest); + PageInfo pageInfo = new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); }