From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 15 五月 2024 16:36:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java index c7d92c9..0dfd021 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockSv.java @@ -48,10 +48,7 @@ QueryResultVo<List<VoUnlock>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = queryVo.pageSize ; - //rsVo.pageCurr = queryVo.pageCurr ; - Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString()); - params.put("pageCurr", pageCurr); - rsVo.pageCurr = pageCurr; + rsVo.pageCurr = queryVo.pageCurr ; rsVo.calculateAndSet(itemTotal, params); rsVo.obj = seUnlockMapper.getUnlocks(params); -- Gitblit v1.8.0