From a51465ed73becec5d836f0b01247bdf1c149b709 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期一, 16 十二月 2024 14:43:23 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 2 +- src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 2 +- src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 2 +- src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java index abd21f2..a6e3740 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java @@ -50,7 +50,7 @@ public List<OrderPakin> selectBySettle(Long settle) { List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("settle", settle)); if (Cools.isEmpty(orderList)) { - return null; + return new ArrayList<>(); } return orderList; } diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java index 691a9f7..7ff82a9 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java @@ -50,7 +50,7 @@ public List<OrderPakout> selectBySettle(Long settle) { List<OrderPakout> orderList = this.selectList(new EntityWrapper<OrderPakout>().eq("settle", settle)); if (Cools.isEmpty(orderList)) { - return null; + return new ArrayList<>(); } return orderList; } diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java index 04f49cd..1ad3354 100644 --- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java @@ -50,7 +50,7 @@ public List<Order> selectBySettle(Long settle) { List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("settle", settle)); if (Cools.isEmpty(orderList)) { - return null; + return new ArrayList<>(); } return orderList; } diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java b/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java index be10ee5..252a40d 100644 --- a/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java +++ b/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java @@ -8,7 +8,7 @@ IMPLEMENT("implement"), QUERY("query"), SELECT_BY_NO("selectByNo"), - SELECT_SETTLE("selectSettle"), + SELECT_SETTLE("selectBySettle"), SELECT_BY_ORDER_ID("selectByOrderId"), SELECT_WORKING_DETLS("selectWorkingDetls"), CHECK_COMPLETE("checkComplete"), -- Gitblit v1.9.1