From 8bf27bf76b09892f0207a604d7f02cec024e031b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 28 十二月 2021 11:24:34 +0800 Subject: [PATCH] !127 add 新增数据脱敏注解,可根据菜单权限字符控制是否脱敏 Merge pull request !127 from Yjoioooo/auto-5403234-dev-1640272112776 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index a3b1c7f..2d0f43a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; @@ -54,8 +55,8 @@ @ApiOperation("鏌ヨ娴嬭瘯鍗曡〃鍒楄〃") @PreAuthorize("@ss.hasPermi('demo:demo:list')") @GetMapping("/list") - public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo) { - return iTestDemoService.queryPageList(bo); + public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { + return iTestDemoService.queryPageList(bo, pageQuery); } /** @@ -64,8 +65,8 @@ @ApiOperation("鑷畾涔夊垎椤垫煡璇�") @PreAuthorize("@ss.hasPermi('demo:demo:list')") @GetMapping("/page") - public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo) { - return iTestDemoService.customPageList(bo); + public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { + return iTestDemoService.customPageList(bo, pageQuery); } @ApiOperation("瀵煎叆娴嬭瘯-鏍¢獙") -- Gitblit v1.9.3