Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-17 9bb98f58d37fc432cb0af5067b51228438f80998

Merge branch 'zigonggao_dev' into huacheng_test

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

@@ -195,9 +195,9 @@
        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",keyword,null,"1");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null,"1");
        int num=IUserService.selectNum(null,keyword,null,"1");
        return getDataTable(list,num);
    }