From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 96315bf..89ad484 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -85,6 +85,10 @@
     <if test="endDate != null and endDate !=''">
         and oa.create_time &lt;= #{endDate}
     </if>
+    <if test="containerCode != null and containerCode !=''">
+        and wc.container_code = #{containerCode}
+        or lc.container_code =#{containerCode}
+    </if>
   </sql>
 
     <sql id="queryColumns">

--
Gitblit v1.9.2