From b304a4c71a87e39756f5f26c0202e1c00d101bb6 Mon Sep 17 00:00:00 2001 From: Zangzhipeng Date: Thu, 12 Sep 2024 14:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=BD=AE=E8=BD=A6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TricycleController.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java index 0280fe5..7e125df 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/TricycleController.java @@ -58,8 +58,8 @@ public class TricycleController { @RequestParam String nuserId, @RequestParam String status, @RequestParam(defaultValue = "") String search -// ,@RequestParam(defaultValue = "1") Integer pageNum, -// @RequestParam(defaultValue = "10") Integer pageSize + ,@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize ){ log.info("/getTricycleList（【三轮车】获取信息登记列表）接口被调用,调用ip: {}, 入参:{}", request.getRemoteAddr(), nuserId); int roleFlag = 0; @@ -82,17 +82,21 @@ public class TricycleController { return ServerResponse.error("当前用户无权限"); } + // 最高权限用户 if (Objects.equals(operatorById.getNlevel(), "2")) { roleFlag = 3; } -// PageHelper.startPage(pageNum, pageSize); - log.info("/getTricycleList（【三轮车】获取信息登记列表））mapper入参:{},{},{},{}", roleFlag,cdepartmentid,status,search); + PageHelper.startPage(pageNum, pageSize); + + // 获取信息填报列表 List tricycleList = tricycleService.getTricycleList(roleFlag,cdepartmentid,status,search); -// PageInfo pageInfo = new PageInfo<>(tricycleList); + + // 分页 + PageInfo pageInfo = new PageInfo<>(tricycleList); log.info("/getTricycleList（【三轮车】获取信息登记列表））接口数据返回,调用ip: {}, 出参:{}", request.getRemoteAddr(), tricycleList); - return ServerResponse.ok(tricycleList); -// return ServerResponse.ok(pageInfo); +// return ServerResponse.ok(tricycleList); + return ServerResponse.ok(pageInfo); } @PostMapping("saveTricycleInfo")