From f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 26 一月 2021 18:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
index e1e86dc..17ab524 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeReagentStatusDao.xml
@@ -223,7 +223,6 @@
from ope_reagent_status as oa
<include refid="queryJoins3"/>
where oa.valid_flag = 1
- and (oa.status = -1 or oa.status = 0 )
<include refid="queryWhereSql3"/>
<if test="applyPerson != null and applyPerson != ''" >
and su.name like concat("%",#{applyPerson},"%")
@@ -263,7 +262,6 @@
<include refid="queryJoins2"/>
left join sys_user su on su.id = oa.user_id
where oa.valid_flag = 1
- and (oa.status = -1 or oa.status = 0 )
<include refid="queryWhereSql2"/>
<if test="applyPerson != null and applyPerson != ''" >
and su.name like concat("%",#{applyPerson},"%")
--
Gitblit v1.9.2