From 1ba00bbbd771572c06f774f48ec748434407d399 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 02 七月 2025 11:06:11 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

---
 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 9a6d0be..b922403 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -158,6 +158,8 @@
         `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
 
         <where>
+            service_donatebaseinfo.del_flag=0
+            and service_relativesconfirmation.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>
             <if test="idcardno != null  and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>

--
Gitblit v1.9.3