From b30e2878e41607fb7fb8168e3b5b61948d7c359a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 17 四月 2025 16:25: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 | 2 +- 1 files changed, 1 insertions(+), 1 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 16a1c10..ad98507 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 @@ -107,7 +107,7 @@ FieldsItem item = new FieldsItem(); item.setUuid(uuid) .setValue(template.get(obj.getFields()).toString()) - .setMatnrId(Long.parseLong(template.get("matnrId").toString())) + .setMatnrId(!Objects.isNull(template.get("matnrId")) ? Long.parseLong(template.get("matnrId").toString()) : null) .setFieldsId(obj.getId()); fieldsItems.add(item); } -- Gitblit v1.9.1