From 40d9a4c56ae76335dd08f628955ad4849808435a Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 17 Jan 2022 10:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7mybatis=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E6=BC=8F=E6=B4=9E3.2.8->3.5.7=E3=80=81mybatis-spring1.2.2->1.3?=
 =?UTF-8?q?.2,=E5=80=9F=E9=98=85=E7=94=B3=E8=AF=B7=E3=80=81=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8=E6=94=BE=E5=BC=80=E5=B7=B2=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/config/README.md                           | 2 +-
 src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/config/README.md b/src/main/resources/config/README.md
index e760176..15b17ae 100644
--- a/src/main/resources/config/README.md
+++ b/src/main/resources/config/README.md
@@ -7,4 +7,4 @@
 #2.0.4 2022-01-05
 解决xp系统使用病案预览全屏按钮点击失效问题
 #2.0.5 2022-01-14
-升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2
+升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2,借阅申请、审批列表放开已过期
diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
index b2723c8..14e23cb 100644
--- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
+++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
@@ -457,10 +457,10 @@
             <if test="record.applyType != '' and record.applyType != null">
                 AND a.apply_type = ${record.applyType}
             </if>
-            <if test="record.applyState != '' and record.applyState != null">
+            <!--<if test="record.applyState != '' and record.applyState != null">
                 AND (CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN apply_state='1' THEN '未提交' WHEN apply_state='2'
                 THEN '已提交' END) = #{record.applyState}
-            </if>
+            </if>-->
             <if test="record.approveState != '' and record.approveState != null">
                 AND (CASE WHEN effe_time &lt;= convert(varchar(10),getdate(),23) THEN '已过期' WHEN approve_state = '1' THEN '审核通过' WHEN
                 approve_state='2' THEN '审核不通过' WHEN approve_state is null THEN '待审批' WHEN approve_state = '' THEN '待审批'