From cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 13 三月 2021 19:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java
index 0371b25..bf0fe80 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/converter/TimeConverter.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.common.core.converter;
import cc.mrbird.febs.common.core.utils.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.convert.WriteConverter;
import com.wuwenze.poi.exception.ExcelKitWriteConverterException;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +22,12 @@
return StringUtils.EMPTY;
} else {
try {
- return DateUtil.formatCstTime(value.toString(), DateUtil.FULL_TIME_SPLIT_PATTERN);
+ if (StrUtil.isNotBlank(value.toString())&&value.toString().length()==19){
+ return value.toString();
+ }else{
+ return DateUtil.formatCstTime(value.toString(), DateUtil.FULL_TIME_SPLIT_PATTERN);
+ }
+
} catch (ParseException e) {
String message = "时间转换异常";
log.error(message, e);
--
Gitblit v1.8.0