From d382ffad92c48f6a96bb7d5e1fd733b90c9ca137 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 03 六月 2023 09:50:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 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 4c3dbe9..930a1b0 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -206,22 +206,30 @@
 
     @Override
     public List<LocMast> findOutMast(Short locType1, List<Integer> crnNos) {
+        if (crnNos.size() == 0) {
+            return null;
+        }
         return this.baseMapper.findOutMast(locType1, crnNos);
     }
 
     @Override
-    public LocMast findInEmptyLocMast(Short locType1, List<Integer> rows) {
-        return this.baseMapper.findInEmptyLocMast(locType1, rows);
+    public List<LocMast> findInEmptyLocMast(Short locType1, List<Integer> rows, Integer crnNo) {
+        return this.baseMapper.findInEmptyLocMast(locType1, rows, crnNo);
     }
 
     @Override
-    public LocMast findEmptyLocMastByLocNos(Short locType1, List<String> locNos) {
-        return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos);
+    public List<LocMast> findEmptyLocMastByLocNos(Short locType1, List<String> locNos, Integer crnNo) {
+        return this.baseMapper.findEmptyLocMastByLocNos(locType1, locNos, crnNo);
     }
 
     @Override
-    public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1) {
-        return this.baseMapper.findEmptyLowFrequencyLocMast(locType1);
+    public List<LocMast> findEmptyLowFrequencyLocMast(Short locType1, Integer crnNo) {
+        return this.baseMapper.findEmptyLowFrequencyLocMast(locType1, crnNo);
+    }
+
+    @Override
+    public List<LocMast> findEmptyLocMast(Short locType1, Integer crnNo) {
+        return this.baseMapper.findEmptyLocMast(locType1, crnNo);
     }
 
     @Override
@@ -231,6 +239,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