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

张天森

2022-11-16 db67d2c23022fed302b8cb07f03076b07ab0941b

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

@@ -58,7 +58,7 @@
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

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