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-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 ef0c43c..c4cfbe3 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
@@ -166,6 +166,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 +179,7 @@
}
}
}
- return toAjax(i);
+ // 鍥炰紶甯︿富閿殑鍒楄〃锛屼究浜庡墠绔洖濉� id
+ return AjaxResult.success(serviceDonatecomporganList);
}
}
--
Gitblit v1.9.3