From 32b8a65d1b5053d2c747ffc22b1330885e5f9e90 Mon Sep 17 00:00:00 2001 From: 07 <15989082884@163.com> Date: Mon, 14 Nov 2022 19:46:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9C=9FBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tbs/controller/TbsScheduleController.java | 1 - .../controller/TbsScheduleItemBudgetController.java | 13 ++++++------- .../tbs/controller/TbsScheduleItemController.java | 13 ++++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java index 1b3ff4d3..aea5f5ab 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java @@ -44,7 +44,6 @@ public class TbsScheduleController { public R> getList(TbsScheduleVo param){ TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - PageUtil.startPage(); List list = tbsScheduleService.list(lqw); return R.ok(list); } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java index 64ea7413..09869592 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java @@ -40,11 +40,10 @@ public class TbsScheduleItemBudgetController { * @return */ @GetMapping("/list") - @PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") + @PreAuthorize("hasRole('tbs:schedule:query')") public R> getList(TbsScheduleItemBudgetVo param){ TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - PageUtil.startPage(); List list = tbsScheduleItemBudgetService.list(lqw); return R.ok(list); } @@ -55,7 +54,7 @@ public class TbsScheduleItemBudgetController { * @return */ @GetMapping("/page") - @PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") + @PreAuthorize("hasRole('tbs:schedule:query')") public R> getPage(TbsScheduleItemBudgetVo param){ TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); @@ -71,7 +70,7 @@ public class TbsScheduleItemBudgetController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.QUERY) - @PreAuthorize("hasRole('tbs:scheduleItemBudget:query')") + @PreAuthorize("hasRole('tbs:schedule:query')") public R getById(@PathVariable("id") String id){ TbsScheduleItemBudget tbsScheduleItemBudget = tbsScheduleItemBudgetService.getById(id); return R.ok(tbsScheduleItemBudget); @@ -86,7 +85,7 @@ public class TbsScheduleItemBudgetController { */ @PostMapping("/updateById") @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.UPDATE) - @PreAuthorize("hasRole('tbs:scheduleItemBudget:update')") + @PreAuthorize("hasRole('tbs:schedule:update')") public R updateById(@RequestBody @Valid TbsScheduleItemBudgetBo param){ TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); boolean result = tbsScheduleItemBudgetService.updateById(entity); @@ -100,7 +99,7 @@ public class TbsScheduleItemBudgetController { */ @PostMapping("/save") @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.INSERT) - @PreAuthorize("hasRole('tbs:scheduleItemBudget:insert')") + @PreAuthorize("hasRole('tbs:schedule:insert')") public R save(@RequestBody @Valid TbsScheduleItemBudget param){ TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget()); boolean result = tbsScheduleItemBudgetService.save(entity); @@ -114,7 +113,7 @@ public class TbsScheduleItemBudgetController { */ @DeleteMapping("/deleteById/{id}") @SysLog(module = SystemModule.Budget, title = "预算考核期项", biz = BizType.DELETE) - @PreAuthorize("hasRole('tbs:scheduleItemBudget:delete')") + @PreAuthorize("hasRole('tbs:schedule:delete')") public R deleteById(@PathVariable("id") Long id){ boolean result = tbsScheduleItemBudgetService.removeById(id); return R.isTrue(result); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java index 143bdf93..c41860cf 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java @@ -40,11 +40,10 @@ public class TbsScheduleItemController { * @return */ @GetMapping("/list") - @PreAuthorize("hasRole('tbs:scheduleItem:query')") + @PreAuthorize("hasRole('tbs:schedule:query')") public R> getList(TbsScheduleItemVo param){ TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - PageUtil.startPage(); List list = tbsScheduleItemService.list(lqw); return R.ok(list); } @@ -55,7 +54,7 @@ public class TbsScheduleItemController { * @return */ @GetMapping("/page") - @PreAuthorize("hasRole('tbs:scheduleItem:query')") + @PreAuthorize("hasRole('tbs:schedule:query')") public R> getPage(TbsScheduleItemVo param){ TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); @@ -71,7 +70,7 @@ public class TbsScheduleItemController { */ @GetMapping("/getById/{id}") @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.QUERY) - @PreAuthorize("hasRole('tbs:scheduleItem:query')") + @PreAuthorize("hasRole('tbs:schedule:query')") public R getById(@PathVariable("id") String id){ TbsScheduleItem tbsScheduleItem = tbsScheduleItemService.getById(id); return R.ok(tbsScheduleItem); @@ -86,7 +85,7 @@ public class TbsScheduleItemController { */ @PostMapping("/updateById") @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.UPDATE) - @PreAuthorize("hasRole('tbs:scheduleItem:update')") + @PreAuthorize("hasRole('tbs:schedule:update')") public R updateById(@RequestBody @Valid TbsScheduleItemBo param){ TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); boolean result = tbsScheduleItemService.updateById(entity); @@ -100,7 +99,7 @@ public class TbsScheduleItemController { */ @PostMapping("/save") @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.INSERT) - @PreAuthorize("hasRole('tbs:scheduleItem:insert')") + @PreAuthorize("hasRole('tbs:schedule:insert')") public R save(@RequestBody @Valid TbsScheduleItem param){ TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem()); boolean result = tbsScheduleItemService.save(entity); @@ -114,7 +113,7 @@ public class TbsScheduleItemController { */ @DeleteMapping("/deleteById/{id}") @SysLog(module = SystemModule.Budget, title = "考核时间项", biz = BizType.DELETE) - @PreAuthorize("hasRole('tbs:scheduleItem:delete')") + @PreAuthorize("hasRole('tbs:schedule:delete')") public R deleteById(@PathVariable("id") Long id){ boolean result = tbsScheduleItemService.removeById(id); return R.isTrue(result);