From 83a97ee40929264c06a0b1c5437620381e2178b9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 26 三月 2024 15:11:31 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index d0b28e3..3c78bbc 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -168,6 +168,7 @@
`base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
<where>
+ service_donationwitness.del_flag=0
<if test="donorno != null and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
<if test="name != null and name != ''">and `service_donatebaseinfo`.`Name` like concat('%', #{name}, '%')
</if>
@@ -187,7 +188,7 @@
#{reporterno}
</if>
<if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
- <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
+ <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
</where>
order by `service_donationwitness`.`create_time` desc
@@ -248,6 +249,8 @@
inner join service_donatebaseinfo b on w.InfoID = b.id
inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
<where>
+ w.del_flag=0
+ and b.del_flag=0
<if test="starttime != null ">and w.OperationBegTime >= #{starttime}</if>
<if test="endtime != null ">and w.OperationBegTime <= #{endtime}</if>
<if test="city != null and city != ''">and o.City = #{city}</if>
--
Gitblit v1.9.3