From d3b5c1badd7f652c4d629a97b0c95b06607bb849 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 30 十月 2026 15:52:57 +0800
Subject: [PATCH] 器管回款显示列表内容调整

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java |    5 ++++-
 1 files changed, 4 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 ef0c43c..817b176 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);
@@ -166,6 +167,7 @@
                 i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
             }
             if (i) {
+                serviceDonorchargeorgan.setId(null);
                 QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
                 queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())
                         .eq("OrganNo", serviceDonorchargeorgan.getOrganno());
@@ -178,6 +180,7 @@
                 }
             }
         }
-        return toAjax(i);
+        // 鍥炰紶甯︿富閿殑鍒楄〃锛屼究浜庡墠绔洖濉� id
+        return AjaxResult.success(serviceDonatecomporganList);
     }
 }

--
Gitblit v1.9.3