Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-19 dd730295a1df836c872d22a69a816f52e4c5d431

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -42,14 +42,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 = "name",required = false) String name)
    {
        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,"2");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",name);

        int num=IUserService.selectNum("2");
        int num=IUserService.selectNum("2",name);
        return getDataTable(list,num);
    }