From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批:待审批节点,第三人账号不可进行修改 2.营销管理-销售台账:勾选单个导出会出现整个导出的情况,但只能显示父项、不能显示子项 3.营销管理-销售台账:点击下拉没有价格,点击详情有价格

---
 src/main/resources/mapper/production/ProductionProductInputMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionProductInputMapper.xml b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
index 506ec70..fe88ae3 100644
--- a/src/main/resources/mapper/production/ProductionProductInputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -24,7 +24,7 @@
                  left join production_product_main ppm on ppi.production_product_main_id = ppm.id
                  left join production_operation_task pot on ppm.production_operation_task_id = pot.id
                  left join production_order po on pot.production_order_id = po.id
-                 left join product_model pm on po.product_model_id = pm.id
+                 left join product_model pm on ppi.product_model_id = pm.id
                  left join product p on pm.product_id = p.id
         <where>
             <if test="c.productNo != null and c.productNo != ''">
@@ -36,6 +36,9 @@
             <if test="c.productName != null and c.productName != ''">
                 and p.product_name like concat('%', #{c.productName}, '%')
             </if>
+            <if test="c.productMainId != null and c.productMainId != ''">
+                and ppm.id = #{c.productMainId}
+            </if>
         </where>
         order by ppi.create_time desc
     </select>

--
Gitblit v1.9.3