From 77ae499763a6aeea2fa4ca58d75d2424dbeb68bf Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 5 Jun 2024 16:02:14 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisWaybillController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index d67b5bbdf..9b29459c5 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -294,11 +294,14 @@ public class EmisWaybillController extends EmisBaseController startPage(); - // 设置通用权限查询参数 + setPrivParams(emisWaybill); - ; if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ + StringBuilder sb = new StringBuilder(emisWaybill.getBillCode()); + sb.deleteCharAt(sb.lastIndexOf(",")); + emisWaybill.setBillCode(sb.toString()); + String[] billCodeSortList = emisWaybill.getBillCode().split(","); if(billCodeSortList.length>1){ emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); @@ -306,15 +309,15 @@ public class EmisWaybillController extends EmisBaseController } if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){ + StringBuilder sb = new StringBuilder(emisWaybill.getOrderSn()); + sb.deleteCharAt(sb.lastIndexOf(",")); + emisWaybill.setOrderSn(sb.toString()); String[] orderSnSortList = emisWaybill.getOrderSn().split(","); if(orderSnSortList.length>1){ emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList)); } } - setPrivParams(emisWaybill); - log.error("===================="); - log.error(JSON.toJSONString(emisWaybill.getParams())); List list = emisWaybillService.selectEmisWaybillList(emisWaybill); return getDataTable(list);