From 3c27920abd9820e9c403a6980d9dde9fd83c2294 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 8 Apr 2025 17:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/alloc/controller/AllocAreaController.java | 4 +++- .../canteen/core/alloc/controller/AllocCanteenController.java | 4 +++- .../canteen/core/alloc/controller/AllocStallController.java | 4 +++- .../java/com/bonus/canteen/core/alloc/domain/AllocArea.java | 3 +++ .../com/bonus/canteen/core/alloc/domain/AllocCanteen.java | 3 +++ .../java/com/bonus/canteen/core/alloc/domain/AllocStall.java | 3 +++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocAreaController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocAreaController.java index 2b5cba4..f3b0ea5 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocAreaController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocAreaController.java @@ -58,7 +58,9 @@ public class AllocAreaController extends BaseController { //@RequiresPermissions("alloc:area:list") @GetMapping("/list") public TableDataInfo list(AllocArea allocArea) { - startPage(); + if (allocArea.isPagenation()) { + startPage(); + } List list = allocAreaService.selectAllocAreaList(allocArea); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocCanteenController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocCanteenController.java index 37c692f..1f5f064 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocCanteenController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocCanteenController.java @@ -40,7 +40,9 @@ public class AllocCanteenController extends BaseController { //@RequiresPermissions("alloc:canteen:list") @GetMapping("/list") public TableDataInfo list(AllocCanteen allocCanteen) { - startPage(); + if (allocCanteen.isPagenation()) { + startPage(); + } List list = allocCanteenService.selectAllocCanteenList(allocCanteen); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocStallController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocStallController.java index 4fd8cab..ffd4be9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocStallController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/controller/AllocStallController.java @@ -40,7 +40,9 @@ public class AllocStallController extends BaseController { //@RequiresPermissions("alloc:stall:list") @GetMapping("/list") public TableDataInfo list(AllocStall allocStall) { - startPage(); + if (allocStall.isPagenation()) { + startPage(); + } List list = allocStallService.selectAllocStallList(allocStall); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocArea.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocArea.java index b7b6b2e..47b6848 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocArea.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocArea.java @@ -22,6 +22,9 @@ import java.util.List; public class AllocArea extends BaseEntity { private static final long serialVersionUID = 1L; + /** 是否分页 */ + private boolean pagenation; + /** 主键id */ private Long areaId; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java index 0cd4593..ae5d389 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocCanteen.java @@ -21,6 +21,9 @@ import com.bonus.common.core.web.domain.BaseEntity; public class AllocCanteen extends BaseEntity { private static final long serialVersionUID = 1L; + /** 是否分页 */ + private boolean pagenation; + /** 主键id */ private Long canteenId; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java index 07d4208..6c02547 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocStall.java @@ -21,6 +21,9 @@ import com.bonus.common.core.web.domain.BaseEntity; public class AllocStall extends BaseEntity { private static final long serialVersionUID = 1L; + /** 是否分页 */ + private boolean pagenation; + /** 档口id */ private Long stallId;