From 49120f2b9db33455756a911e56cfefd7c3120a14 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 6 ++++++
1 files changed, 6 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 53f6c13..4e15e11 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
@@ -73,6 +73,12 @@
if (StringUtils.isNotBlank(serviceDonationwitness.getOperationdoctor())) {
wrappers.eq(ServiceDonationwitness::getOperationdoctor, serviceDonationwitness.getOperationdoctor());
}
+ // 2026-10-22锛氶粯璁ゅ彧鏌ヨ鏈垹闄よ褰�
+ if (StringUtils.isNotNull(serviceDonationwitness.getDel_flag())) {
+ wrappers.eq(ServiceDonationwitness::getDel_flag, serviceDonationwitness.getDel_flag());
+ } else {
+ wrappers.eq(ServiceDonationwitness::getDel_flag, 0);
+ }
return this.list(wrappers);
}
--
Gitblit v1.9.3