From 3d471ea8a5325faa98817bcb0eb37e1fee871da7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 23 十二月 2024 16:53:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 7f1c91f..f21a6a2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -71,6 +71,9 @@
             <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
                 and fol.quantity regexp #{finishedOperateLog.quantity}
             </if>
+            <if test="finishedOperateLog.processId != null and finishedOperateLog.processId != ''">
+                and fol.process_id regexp #{finishedOperateLog.processId}
+            </if>
             <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
                 and fol.operator regexp #{finishedOperateLog.operator}
             </if>

--
Gitblit v1.8.0