From a5e1d3d875f140065a8f30a27601fb45ad36714a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 05 二月 2021 16:12:00 +0800
Subject: [PATCH] 修改入库接口--入的是智能柜的走入库+领用流程

---
 src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
index a557fe8..4e3e7c7 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml
@@ -61,7 +61,8 @@
     CONCAT(location1,'-',location2)
     END
     location,
-    bm2.meta_value department
+    bm2.meta_value department,
+    sl.project
     from sys_laboratory as sl
     LEFT JOIN base_meta bm1 on bm1.id = sl.type
     left JOIN base_meta bm2 on bm2.id = sl.department
@@ -72,6 +73,9 @@
     <if test="type != null and type != ''">
       and sl.type = #{type};
     </if>
+    <if test="project != null and project != ''">
+      and sl.project like concat("%",#{project},"%")
+    </if>
   </select>
 
   <select id="getSysLaboratoryTotalCount" parameterType="java.util.Map" resultType="int">

--
Gitblit v1.9.2