From 8c215c8be0f5076e8c95daf1b2203440ca7dfcad Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 13:42:50 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index ef5f73b..9bc8a89 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -297,13 +297,23 @@
Boolean i = null;
for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganList) {
log.info("鎹愮尞鍣ㄥ畼绉绘id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonateorgan.getId(), serviceDonateorgan.getInfoid());
+ // 2026-10-22锛氬悓涓�妗堜緥銆佸悓涓�鍣ㄥ畼鍙繚鐣欎竴鏉℃湭鍒犻櫎璁板綍鈥斺�斿凡瀛樺湪鍒欐洿鏂帮紝閬垮厤閲嶅鎻掑叆
+ ServiceDonateorgan query = new ServiceDonateorgan();
+ query.setInfoid(serviceDonateorgan.getInfoid());
+ query.setOrganno(serviceDonateorgan.getOrganno());
+ query.setDel_flag(0);
+ List<ServiceDonateorgan> exist = serviceDonateorganService.queryList(query);
+ if (!CollectionUtils.isEmpty(exist)) {
+ serviceDonateorgan.setId(exist.get(0).getId());
+ }
if (serviceDonateorgan.getId() == null) {
i = serviceDonateorganService.save(serviceDonateorgan);
} else {
i = serviceDonateorganService.updateById(serviceDonateorgan);
}
}
- return toAjax(i);
+ // 鍥炰紶甯︿富閿殑鍒楄〃锛屼究浜庡墠绔洖濉� id
+ return AjaxResult.success(serviceDonateorganList);
}
}
--
Gitblit v1.9.3