From eb64c3ede631f9f1ec49260db5190027fa08fb31 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期二, 23 一月 2024 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
index 8699587..f8bfd29 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -38,6 +38,7 @@
<include refid="selectDaParamCollectionVo"/>
<where>
<if test="workOrderNo != null and workOrderNo != ''"> and work_order_no = #{workOrderNo}</if>
+ <if test="type != null and type != ''"> and type = #{type}</if>
<if test="sfcCode != null and sfcCode != ''"> and sfc_code = #{sfcCode}</if>
<if test="productCode != null and productCode != ''"> and product_code = #{productCode}</if>
<if test="productionLine != null and productionLine != ''"> and production_line = #{productionLine}</if>
--
Gitblit v1.9.3