From 6daef0a5671fbc2a7ba2fd181fb6329192a2564a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Tue, 25 Jul 2023 11:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurApplyDetailImplService.java | 21 +++++++++++++------ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index 42d076398..326005595 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -90,17 +90,26 @@ public class PurApplyDetailImplService implements PurApplyDetailService { @Override public List getDetailList(PurApplyDetailRequest purApplyDetailRequest) { - if (null == purApplyDetailRequest) { +// if (null == purApplyDetailRequest) { +// return Collections.emptyList(); +// } +// if (purApplyDetailRequest.getPage() == null) +// purApplyDetailRequest.setPage(1); +// if (purApplyDetailRequest.getLimit() == null) { +// purApplyDetailRequest.setLimit(10); +// } +// PageHelper.offsetPage((purApplyDetailRequest.getPage() - 1) * purApplyDetailRequest.getLimit(), purApplyDetailRequest.getLimit()); + if (purApplyDetailRequest == null) { return Collections.emptyList(); } - if (purApplyDetailRequest.getPage() == null) - purApplyDetailRequest.setPage(1); - if (purApplyDetailRequest.getLimit() == null) { - purApplyDetailRequest.setLimit(10); + if (purApplyDetailRequest.getPage() != null) { + int offset = (purApplyDetailRequest.getPage() - 1) * purApplyDetailRequest.getLimit(); + PageHelper.offsetPage(offset, purApplyDetailRequest.getLimit()); } - PageHelper.offsetPage((purApplyDetailRequest.getPage() - 1) * purApplyDetailRequest.getLimit(), purApplyDetailRequest.getLimit()); return purApplyDetailDao.selectPurApplyDetailList(purApplyDetailRequest); + } + } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 912ed505d..482789d11 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -765,7 +765,7 @@ basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy, - basic_products.zdcfsycs, +-- basic_products.zdcfsycs, basic_products.sfwwjbz, basic_products.syqsfxyjxmj, basic_products.mjfs,