From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
index 222be9f..e06e536 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -158,6 +158,7 @@
sd.setDel_flag(0);
ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonatecompletion, ServiceDonorchargeorgan.class);
serviceDonorchargeorgan.setReceiveTime(serviceDonatecompletion.getTransplanttime());
+ serviceDonorchargeorgan.setOrganState(serviceDonatecompletion.getTransplantstate()+"");
List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(sd);
if (serviceDonatecompletion.getId() == null && CollectionUtils.isEmpty(serviceDonatecomporgans)) {
i = serviceDonatecomporganService.save(serviceDonatecompletion);
@@ -165,7 +166,8 @@
serviceDonatecompletion.setId(serviceDonatecomporgans.get(0).getId());
i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
}
- if (i) {
+ if (i&&!serviceDonorchargeorgan.getOrganname().equals("閬椾綋")) {
+ serviceDonorchargeorgan.setId(null);
QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())
.eq("OrganNo", serviceDonorchargeorgan.getOrganno());
--
Gitblit v1.9.3