From 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
index 1993ced..36ae49e 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml
@@ -111,7 +111,18 @@
     </insert>
 
     <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
-        update ope_warehouse_reserve set reagent_id=#{reagentId},warehouseId=#{warehouseId}, article_number=#{articleNumber}, reserve=#{reserve}, update_time=now()
+        update ope_warehouse_reserve
+        <set>
+            reagent_id=#{reagentId},
+            reserve=#{reserve},
+            update_time=now(),
+            <if test="articleNumber != null and articleNumber !=''">
+                article_number=#{articleNumber},
+            </if>
+            <if test="warehouseId != null and warehouseId !=''">
+                warehouseId=#{warehouseId},
+            </if>
+        </set>
         where id=#{id}
     </update>
 

--
Gitblit v1.9.2