From a9389e50d306a05565dfb869cc907638d91fa7c7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 10 七月 2026 14:39:11 +0800
Subject: [PATCH] 器官分配，器官利用子表删除统一
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java | 6 +++++-
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 10 +++++++++-
2 files changed, 14 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 aea7af9..4759017 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
@@ -106,7 +106,15 @@
}
if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
- serviceDonatecomporganService.updateById(serviceDonatecomporgan);
+ if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getId())) {
+ if (ObjectUtils.isNotEmpty(serviceDonatecomporgan.getDelFlag()) && serviceDonatecomporgan.getDelFlag() == 1) {
+ serviceDonatecomporganService.getById(serviceDonatecomporgan.getId());
+ } else {
+ serviceDonatecomporganService.updateById(serviceDonatecomporgan);
+ }
+ } else{
+ serviceDonatecomporganService.updateById(serviceDonatecomporgan);
+ }
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
index 5db6561..e3aa9b5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
@@ -153,7 +153,11 @@
if (b == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
if(ObjectUtils.isNotEmpty(serviceDonateorgan.getId()) ) {
- serviceDonateorganMapper.updateById(serviceDonateorgan);
+ if(ObjectUtils.isNotEmpty(serviceDonateorgan.getDelFlag())&&serviceDonateorgan.getDelFlag()==1 ) {
+ serviceDonateorganMapper.deleteById(serviceDonateorgan.getId());
+ }else {
+ serviceDonateorganMapper.updateById(serviceDonateorgan);
+ }
}else {
serviceDonateorganMapper.insert(serviceDonateorgan);
}
--
Gitblit v1.9.3