From a270a93b42e94f789962b6e0d3ac16e5619bf5f9 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期三, 19 十月 2022 14:10:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test --- flower_city/src/main/java/com/dg/core/controller/UserController.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java index 76755b1..585dc16 100644 --- a/flower_city/src/main/java/com/dg/core/controller/UserController.java +++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java @@ -170,14 +170,15 @@ @GetMapping("/getlist") @Authorization public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum, - @RequestParam(value = "pageSize",required = false) Integer pageSize) + @RequestParam(value = "pageSize",required = false) Integer pageSize, + @RequestParam(value = "userName",required = false) String userName) { Assert.notNull(pageNum, "pageNum can not be empty"); Assert.notNull(pageSize, "pageSize can not be empty"); Page<SysUser> pageParam = new Page<>(pageNum,pageSize); - List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3"); + List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",userName); - int num=IUserService.selectNum("3"); + int num=IUserService.selectNum("3",userName); return getDataTable(list,num); } -- Gitblit v1.7.1