From d8536385c8d91a597f3cacaf3442c4baae226c09 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 13 Jun 2022 18:35:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/glxp/sale/admin/dao/inout/OrderDao.java    | 5 +++--
 .../glxp/sale/admin/service/inout/impl/OrderServiceImpl.java | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java
index 8a53ab1..425206c 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/OrderDao.java
@@ -3,12 +3,13 @@ package com.glxp.sale.admin.dao.inout;
 import com.glxp.sale.admin.entity.inout.OrderEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseEntity;
 import com.glxp.sale.admin.req.inout.OrderFilterRequest;
-import com.glxp.sale.admin.res.inout.OrderNoResult;
 import com.glxp.sale.admin.req.inout.OrderQueryRequest;
+import com.glxp.sale.admin.res.inout.OrderNoResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 @Mapper
 public interface OrderDao {
@@ -62,7 +63,7 @@ public interface OrderDao {
      */
     OrderEntity selectByBillNo(String billNo);
 
-    List<OrderEntity> selectByIds(@Param("orderIds") List<String> orderIds);
+    List<OrderEntity> selectByIds(@Param("orderIds") Set<String> orderIds);
 
     /**
      * 批量更新单据信息
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index 5e6b6f3..7d98402 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -329,7 +329,7 @@ public class OrderServiceImpl implements OrderService {
     }
 
     //通过源单据查询所有关联的单据数据
-    public void getLinkedOrderId(String id, List<String> orderIds) {
+    public void getLinkedOrderId(String id, Set<String> orderIds) {
         List<String> list = getOneOrderById(id);
         if (!orderIds.containsAll(list)) {
             //找出不包含在原有集合中的单据号，回调方法
@@ -372,7 +372,7 @@ public class OrderServiceImpl implements OrderService {
      */
     @Override
     public List<OrderEntity> getAllOrder(OrderEntity orderEntity) {
-        List<String> orderIds = new ArrayList<>();
+        Set<String> orderIds = new HashSet<>();
         orderIds.add(orderEntity.getId());
 
         getLinkedOrderId(orderEntity.getId(), orderIds);