From 31dd633b16c89af8eef7c4dfbc99819db4e7fc3f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 10:09:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index c189f67..6f114d4 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -778,11 +778,14 @@
     <select id="getOrderProductDistinctByIds">
         select
 
-            (a.product_id) as 'productId',
-            a.product_name as 'productName',
-            a.order_number as 'orderNumber'
+        (a.product_id) as 'productId',
+        a.product_name as 'productName',
+        a.order_number as 'orderNumber'
         from order_detail as a
-        where a.order_id = #{orderId} and a.product_id regexp #{productId}
+        where a.order_id = #{orderId} and a.product_id IN
+        <foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         group by a.product_id
     </select>
 

--
Gitblit v1.8.0