From a5e77720f3badb0cb1f2998a34607c759b07f7c1 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 01 八月 2026 11:46:30 +0800
Subject: [PATCH] 器管获取附件新增infoId过滤条件

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
index e632005..1257d59 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java
@@ -71,6 +71,9 @@
         if (StringUtils.isNotBlank(serviceDonationwitness.getDonorno())) {
             wrappers.eq(ServiceDonationwitness::getDonorno, serviceDonationwitness.getDonorno());
         }
+        if (ObjectUtils.isNotEmpty(serviceDonationwitness.getInfoid())) {
+            wrappers.eq(ServiceDonationwitness::getInfoid, serviceDonationwitness.getInfoid());
+        }
         if (StringUtils.isNotBlank(serviceDonationwitness.getGainhospitalname())) {
             wrappers.like(ServiceDonationwitness::getGainhospitalname, serviceDonationwitness.getGainhospitalname());
         }
@@ -148,6 +151,7 @@
             for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO : donationwitnessBaseInfos) {
                 ServiceDonationwitnessorgan serviceDonationwitnessorgan = new ServiceDonationwitnessorgan();
                 serviceDonationwitnessorgan.setInfoid(donationwitnessBaseInfoDTO.getInfoid());
+                serviceDonationwitnessorgan.setDelFlag(0);
                 List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganMapper.selectServiceDonationwitnessorganList(serviceDonationwitnessorgan);
                 donationwitnessBaseInfoDTO.setServiceDonationwitnessorgans(serviceDonationwitnessorgans);
             }

--
Gitblit v1.9.3