From ad9930c5cf8624b8056bb9fda164fa65e66ef9cd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 13:30:11 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 02a3c1b..4f37cc8 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
@@ -64,7 +64,7 @@
format = DateUtils.format(new Date(), "yyyy");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
format = DateUtils.format(new Date(), "MM");
- } else {
+ } else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
format = DateUtils.format(new Date(), "dd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
@@ -128,7 +128,7 @@
* @time 2025/3/5 14:00
*/
public static Map<?, ?> objectToMap (Object obj) {
- if (obj == null) {
+ if (Objects.isNull(obj)) {
return null;
}
ObjectMapper objectMapper = new ObjectMapper();
--
Gitblit v1.9.1