From 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 18:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

---
 src/main/resources/mapper/production/ProductionOrderMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 50ebd4d..35a7941 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -129,6 +129,9 @@
                 <if test="c.endTime != null">
                     and po.end_time &lt;= #{c.endTime}
                 </if>
+                <if test="c.workshopId != null">
+                    and t7.id = #{c.workshopId}
+                </if>
             </if>
         </where>
     </sql>

--
Gitblit v1.9.3