From 8bd5f91e25d50766108916a33378999c3e56662c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 24 三月 2021 16:06:09 +0800
Subject: [PATCH] 去除领用履历中已删除试剂

---
 src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 76dd4c5..d6b7303 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -177,6 +177,7 @@
       left join sys_user as fir on fir.id=oa.first_user
     left join base_meta as bm on sr.product_home = bm.id
     where oa.valid_flag = 1
+      and sr.valid_flag = 1
     <include refid="queryWhereSql"/>
     order by oa.create_time desc
     <if test="first != null and pageSize != null">
@@ -194,7 +195,7 @@
       left join sys_user as sys on sys.id=oa.before_approve_user_id
       left join sys_user as fir on fir.id=oa.first_user
       left join base_meta as bm on sr.product_home = bm.id
-      where oa.valid_flag = 1
+      where oa.valid_flag = 1 and sr.valid_flag = 1
     <include refid="queryWhereSql"/>
   </select>
 

--
Gitblit v1.9.2