From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +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 | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..5bbc861 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
@@ -41,6 +41,7 @@
.getOne(new LambdaQueryWrapper<SerialRule>()
.eq(SerialRule::getCode, code));
if (Objects.isNull(serialRule)) {
+
throw new CoolException("褰撳墠涓氬姟锛�" + code + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
SerialRuleItemService serialRuleItemService = SpringUtils.getBean(SerialRuleItemService.class);
@@ -50,7 +51,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 +84,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);
+ }
}
});
@@ -109,7 +113,7 @@
if (Objects.isNull(start) || end == 0) {
buffer.append(str);
} else {
- if (str.length() <= (end + start)) {
+ if (str.length() < (end + start)) {
throw new CoolException("鎴彇瀛楃璧峰嚭瀛楃涓查暱搴︼紝璇锋煡鐪嬭鍒欒瀹氾紒锛�");
}
//杩斿洖璧峰浣嶇疆lenStr寮�濮嬶紝缁堢偣浣嶇疆涓簂enStr + len闀垮害鐨勫瓧绗︿覆
--
Gitblit v1.9.1