From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
index 224028a..5db6561 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
@@ -128,7 +128,7 @@
}
@Override
- public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
+ public long add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
ServiceDonateorganBase serviceDonateorganBase = DtoConversionUtils.sourceToTarget(serviceDonateorganBaseVO, ServiceDonateorganBase.class);
boolean save = false;
if (ObjectUtils.isNotEmpty(serviceDonateorganBase)) {
@@ -141,7 +141,7 @@
}
}
- return save;
+ return serviceDonateorganBase.getId();
}
@Override
@@ -152,7 +152,11 @@
b = updateById(serviceDonateorganBase);
if (b == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
- serviceDonateorganMapper.updateById(serviceDonateorgan);
+ if(ObjectUtils.isNotEmpty(serviceDonateorgan.getId()) ) {
+ serviceDonateorganMapper.updateById(serviceDonateorgan);
+ }else {
+ serviceDonateorganMapper.insert(serviceDonateorgan);
+ }
}
}
}
--
Gitblit v1.9.3