From fa5b8238f31749cc4b0469df317b5849da08a419 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期日, 30 三月 2025 14:53:15 +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/system/utils/SerialRuleUtils.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
index 4f37cc8..9e977d0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
@@ -50,7 +50,7 @@
.list(new LambdaQueryWrapper<SerialRuleItem>()
.eq(SerialRuleItem::getRuleId, serialRule.getId())
.orderByAsc(SerialRuleItem::getSort));
- if (Objects.isNull(ruleItems)) {
+ if (Objects.isNull(ruleItems) || ruleItems.isEmpty()) {
throw new CoolException("缂栫爜瑙勫垯鏄庣粏涓虹┖锛侊紒");
}
@@ -83,8 +83,11 @@
//鍒ゆ柇鏄惁璁剧疆鎴彇闀垮害鍜岃捣濮嬫埅鍙栦綅缃�
buffer.append(subStr(format, rule.getLenStr(), rule.getLen()));
} else if (rule.getWkType().equals(SerialRuleType.WK_FEILD.wkType)) {
- String subStr = subStr(objectToMap(obj).get(rule.getFeildValue()).toString(), rule.getLenStr(), rule.getLen());
- buffer.append(subStr);
+ String subStr;
+ if (!Objects.isNull(objectToMap(obj).get(rule.getFeildValue()))) {
+ subStr = subStr(objectToMap(obj).get(rule.getFeildValue()).toString(), rule.getLenStr(), rule.getLen());
+ buffer.append(subStr);
+ }
}
});
--
Gitblit v1.9.1