From 658141dd2f6ea08bff904d7dfd987a696ece94fe Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 19 三月 2026 09:30:37 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 715cf43..68ce40f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -388,20 +388,36 @@
companyParams.forEach(param -> {
Companys companys = new Companys();
BeanUtils.copyProperties(param, companys);
- if (Objects.isNull(companys.getCode())) {
+ if (Objects.isNull(companys.getCode()) || StringUtils.isBlank(companys.getCode())) {
throw new CoolException("浼佷笟缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getName, param.getName()).last("limit 1"));
- if (Objects.isNull(one)) {
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);
- companys.setCode(ruleCode);
- } else {
- throw new CoolException(one.getName() + "锛屼紒涓氬悕閲嶅锛侊紒");
+ if (Objects.isNull(companys.getName()) || StringUtils.isBlank(companys.getName())) {
+ throw new CoolException("浼佷笟鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
- companys.setType(CompanysType.getCustomVal(param.getType()))
- .setId(null);
- if (!companysService.save(companys)) {
- throw new CoolException("浼佷笟淇濆瓨澶辫触锛侊紒");
+
+ // 骞傜瓑鍚屾锛氫紭鍏堟寜缂栫爜鍖归厤锛屾壘涓嶅埌鍐嶆寜鍚嶇О鍖归厤
+ Companys one = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getCode, param.getCode())
+ .last("limit 1"));
+ if (Objects.isNull(one)) {
+ one = companysService.getOne(new LambdaQueryWrapper<Companys>()
+ .eq(Companys::getName, param.getName())
+ .last("limit 1"));
+ }
+
+ companys.setType(CompanysType.getCustomVal(param.getType()));
+ if (!Objects.isNull(one)) {
+ companys.setId(one.getId());
+ // 宸插瓨鍦ㄥ垯鏇存柊锛屼笉閲嶅鎶ラ敊
+ if (!companysService.saveOrUpdate(companys)) {
+ throw new CoolException("浼佷笟鏇存柊澶辫触锛侊紒");
+ }
+ } else {
+ companys.setId(null);
+ // 鏂板鏃朵繚鐣橢RP浼犲叆缂栫爜锛屼笉鍐嶈鐩栫敓鎴�
+ if (!companysService.save(companys)) {
+ throw new CoolException("浼佷笟淇濆瓨澶辫触锛侊紒");
+ }
}
});
return R.ok();
--
Gitblit v1.9.1