From a6d5f3ad6ca49a334eff47b3b42d5caf6235b558 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 10 七月 2026 17:13:51 +0800
Subject: [PATCH] 删除无效
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecomporganServiceImpl.java | 1 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 4 ++--
ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml | 1 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonationwitnessServiceImpl.java | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
index 4759017..8d034c4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -108,12 +108,12 @@
for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getId())) {
if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getDelFlag()) && serviceDonatecomporgan.getDelFlag() == 1) {
- serviceDonatecomporganService.getById(serviceDonatecomporgan.getId());
+ serviceDonatecomporganService.removeById(serviceDonatecomporgan.getId());
} else {
serviceDonatecomporganService.updateById(serviceDonatecomporgan);
}
} else{
- serviceDonatecomporganService.updateById(serviceDonatecomporgan);
+ serviceDonatecomporganService.save(serviceDonatecomporgan);
}
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecomporganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecomporganServiceImpl.java
index ed07471..5fa69e6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecomporganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecomporganServiceImpl.java
@@ -30,6 +30,7 @@
@Override
public List<ServiceDonatecomporgan> queryList(ServiceDonatecomporgan serviceDonatecomporgan) {
LambdaQueryWrapper<ServiceDonatecomporgan> wrappers = Wrappers.lambdaQuery();
+ wrappers.eq(ServiceDonatecomporgan::getDelFlag, 0);
if (serviceDonatecomporgan.getInfoid() != null) {
wrappers.eq(ServiceDonatecomporgan::getInfoid, serviceDonatecomporgan.getInfoid());
}
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..66764f1 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
@@ -148,6 +148,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);
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
index ac45d2b..8907723 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessorganMapper.xml
@@ -71,6 +71,7 @@
resultMap="ServiceDonationwitnessorganResult">
<include refid="selectServiceDonationwitnessorganVo"/>
<where>
+ and del_flag=0
<if test="infoid != null ">and InfoID = #{infoid}</if>
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
<if test="organno != null and organno != ''">and OrganNo = #{organno}</if>
--
Gitblit v1.9.3