From 70efbfc8399978f685e91b3ab2fb414cbaf80b63 Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期二, 18 十月 2022 17:01:54 +0800 Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test --- flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java index 7cb1f51..eeb3607 100644 --- a/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java +++ b/flower_city/src/main/java/com/dg/core/controller/ElseAccessoryController.java @@ -41,13 +41,13 @@ @Authorization public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum, @RequestParam(value = "pageSize",required = false) Integer pageSize, - @RequestParam(value = "Name",required = false) String Name, + @RequestParam(value = "name",required = false) String name, @CurrentUser SysUser sysUser) { Page<ElseAccessoryEntity> pageParam = new Page<>(pageNum,pageSize); List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId()); - List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,Name,ids); - int num=iElseAccessoryService.countNum(Name,ids); + List<ElseAccessoryEntity> list = iElseAccessoryService.selectConfigList(pageParam,pageSize,name,ids); + int num=iElseAccessoryService.countNum(name,ids); return getDataTable(list,num); } -- Gitblit v1.7.1