From 37cb417ce5b060c21241f32f43c00f2ec9e5f893 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 14:54:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index 6182be3..ea9f543 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -118,9 +118,7 @@
String index = fieldsIndex.toString();
FieldsItemService fieldsItemService = SpringUtils.getBean(FieldsItemService.class);
for (Fields field : fields) {
- Map<String, String> extendFields = (Map<String, String>) params.get("extendFields");
- if (!Objects.isNull(extendFields)) {
- if (!Objects.isNull(extendFields.get(field.getFields()))) {
+ if (!Objects.isNull(params.get(field.getFields()))) {
FieldsItem indexItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>()
.eq(FieldsItem::getUuid, index)
.eq(FieldsItem::getFieldsId, field.getId()));
@@ -129,22 +127,20 @@
FieldsItem item = new FieldsItem();
item.setUuid(index)
.setFieldsId(field.getId())
- .setValue(extendFields.get(field.getFields()).toString());
+ .setValue(params.get(field.getFields()).toString());
if (!fieldsItemService.save(item)) {
throw new CoolException("鎵╁睍瀛楁淇敼澶辫触锛侊紒");
}
} else {
- indexItem.setValue(extendFields.get(field.getFields()).toString());
+ indexItem.setValue(params.get(field.getFields()).toString());
if (!fieldsItemService.updateById(indexItem)) {
throw new CoolException("鎵╁睍瀛楁淇敼澶辫触锛侊紒");
}
}
}
- }
}
} else {
- String uuid16 = CommonUtil.randomUUID16();
- saveFields(params, uuid16);
+ saveFields(params, params.get("index").toString());
}
}
}
--
Gitblit v1.9.1