diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java index f2bb3b3..e48c913 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java @@ -44,7 +44,9 @@ public class SupermarketInfoController extends BaseController { //@RequiresPermissions("supermarket:info:list") @GetMapping("/list") public TableDataInfo list(SupermarketInfo supermarketInfo) { - startPage(); + if (supermarketInfo.isPagenation()) { + startPage(); + } List list = supermarketInfoService.selectSupermarketInfoList(supermarketInfo); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java index 614fd5b..bb61149 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/domain/SupermarketInfo.java @@ -20,6 +20,9 @@ import com.bonus.common.core.web.domain.BaseEntity; public class SupermarketInfo extends BaseEntity { private static final long serialVersionUID = 1L; + /** 是否分页 */ + private boolean pagenation; + /** 超市id */ private Long supermarketId;