From 57a6735173d59feb6cfd95c9a8ec76d6f87bc578 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 四月 2024 12:46:28 +0800
Subject: [PATCH] PDF合并，BUG修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
index dc23d22..0df3b16 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -80,7 +80,8 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
- return toAjax(serviceDonationwitnessorganService.save(serviceDonationwitnessorgan));
+ boolean save = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
+ return AjaxResult.success(serviceDonationwitnessorgan);
}
/**
@@ -107,7 +108,6 @@
}
- @RepeatSubmit
@ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹樿幏鍙�")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonationwitnessorgan")
@@ -118,6 +118,15 @@
Boolean i = null;
for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessorganList) {
log.info("鎹愮尞鍣ㄥ畼鑾峰彇id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitnessorgan.getId(), serviceDonationwitnessorgan.getInfoid());
+ //鏍规嵁infoid鍜屽櫒瀹樼紪鍙凤紝鍒ゆ柇杩欎釜鍣ㄥ畼鏄惁宸茬粡瀛樿繘琛ㄤ腑
+ ServiceDonationwitnessorgan serviceDonationwitnessorgan2 = new ServiceDonationwitnessorgan();
+ serviceDonationwitnessorgan2.setInfoid(serviceDonationwitnessorgan.getInfoid());
+ serviceDonationwitnessorgan2.setOrganno(serviceDonationwitnessorgan.getOrganno());
+ List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan2);
+ log.info("serviceDonationwitnessorgans鐨勬暟閲忎负 : {},infoid涓猴細{}锛孫rganno涓猴細{}", serviceDonationwitnessorgans.size(), serviceDonationwitnessorgan.getInfoid(), serviceDonationwitnessorgan.getOrganno());
+ if (!CollectionUtils.isEmpty(serviceDonationwitnessorgans)) {
+ serviceDonationwitnessorgan.setId(serviceDonationwitnessorgans.get(0).getId());
+ }
if (serviceDonationwitnessorgan.getId() == null) {
i = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
} else {
--
Gitblit v1.9.3