diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index ae1cba00..ef23f489 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -40,7 +40,10 @@ public class ShopController extends BaseController { @GetMapping("/list") public TableDataInfo list(ShopBo shop) { - LambdaQueryWrapper qw = new LambdaQueryWrapper().eq(shop.getType()!=null,OShop::getType,shop.getType()); + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(shop.getType()!=null,OShop::getType,shop.getType()) + .ne(shop.getType()==null,OShop::getType,999) + ; List list = shopService.list(qw); return getDataTable(list); } diff --git a/docs/qihang-oms.sql b/docs/qihang-oms.sql index 8c8888dd..32985bf2 100644 --- a/docs/qihang-oms.sql +++ b/docs/qihang-oms.sql @@ -11,7 +11,7 @@ Target Server Version : 80200 File Encoding : 65001 - Date: 19/05/2025 14:30:08 + Date: 19/05/2025 14:36:06 */ SET NAMES utf8mb4; diff --git a/vue/src/views/shop/offline_shop.vue b/vue/src/views/shop/offline_shop.vue index 7b974a27..06fda1a7 100644 --- a/vue/src/views/shop/offline_shop.vue +++ b/vue/src/views/shop/offline_shop.vue @@ -55,10 +55,9 @@ - - + + -