周期BUG

src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java

@@ -44,7 +44,6 @@ public class TbsScheduleController {
     public R<List<TbsSchedule>> getList(TbsScheduleVo param){
         TbsSchedule entity = CopierUtil.copy(param,new TbsSchedule());
         LambdaQueryWrapper<TbsSchedule> lqw = new LambdaQueryWrapper<>(entity);
-        PageUtil.startPage();
         List<TbsSchedule> list = tbsScheduleService.list(lqw);
         return R.ok(list);
     }

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<List<TbsScheduleItemBudget>> getList(TbsScheduleItemBudgetVo param){
         TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget());
         LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>(entity);
-        PageUtil.startPage();
         List<TbsScheduleItemBudget> 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<PageVo<TbsScheduleItemBudget>> getPage(TbsScheduleItemBudgetVo param){
         TbsScheduleItemBudget entity = CopierUtil.copy(param,new TbsScheduleItemBudget());
         LambdaQueryWrapper<TbsScheduleItemBudget> 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<TbsScheduleItemBudget> 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);

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<List<TbsScheduleItem>> getList(TbsScheduleItemVo param){
         TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem());
         LambdaQueryWrapper<TbsScheduleItem> lqw = new LambdaQueryWrapper<>(entity);
-        PageUtil.startPage();
         List<TbsScheduleItem> 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<PageVo<TbsScheduleItem>> getPage(TbsScheduleItemVo param){
         TbsScheduleItem entity = CopierUtil.copy(param,new TbsScheduleItem());
         LambdaQueryWrapper<TbsScheduleItem> 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<TbsScheduleItem> 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);