From e47d5da578f11efd67b1d66242519c09c3cf7c56 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 31 五月 2023 15:10:58 +0800
Subject: [PATCH] 出库合并

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 119b925..9047436 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -215,12 +215,12 @@
     }
 
     @Override
-    public LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
+    public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
         return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
     }
 
     @Override
-    public LocMast findEmptyLowFrequencyLocMast(Short locType1) {
+    public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1) {
         return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
     }
 
@@ -231,6 +231,9 @@
 
     @Override
     public List<LocMast> selectByLocNos(List<String> locNos) {
+        if (locNos == null || locNos.size() == 0) {
+            return new ArrayList<LocMast>();
+        }
         return this.baseMapper.selectByLocNos(locNos);
     }
 }

--
Gitblit v1.9.1