From f91a19677a26d6cb8fe93f803fb4fcc83e730943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 25 Aug 2022 21:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/DepotHeadController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index b895a002..4776cc14 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -126,10 +126,10 @@ public class DepotHeadController { String [] organArray = depotHeadService.getOrganArray(subType, ""); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findByAll(beginTime, endTime, type, creatorArray, - organArray, materialParam, depotList, oId, number, remark, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findByAllCount(beginTime, endTime, type, creatorArray, - organArray, materialParam, depotList, oId, number, remark); + List list = depotHeadService.findByAll(beginTime, endTime, type, creatorArray, organArray, + StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findByAllCount(beginTime, endTime, type, creatorArray, organArray, + StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark); map.put("total", total); //存放数据json数组 if (null != list) { @@ -261,10 +261,10 @@ public class DepotHeadController { String [] creatorArray = depotHeadService.getCreatorArray(roleType); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, number, - creatorArray, materialParam, depotList, depotFList, remark, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, number, - creatorArray, materialParam, depotList, depotFList, remark); + List list = depotHeadService.findAllocationDetail(beginTime, endTime, subType, StringUtil.toNull(number), + creatorArray, StringUtil.toNull(materialParam), depotList, depotFList, remark, (currentPage-1)*pageSize, pageSize); + int total = depotHeadService.findAllocationDetailCount(beginTime, endTime, subType, StringUtil.toNull(number), + creatorArray, StringUtil.toNull(materialParam), depotList, depotFList, remark); map.put("rows", list); map.put("total", total); res.code = 200;