From b2b034c46fe7721f8ae05e850f99b51e5ca06836 Mon Sep 17 00:00:00 2001
From: gongzhenkun <1658878546@qq.com>
Date: Mon, 29 Aug 2022 17:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E9=97=B4=E5=9D=90=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/service/impl/TRecordServiceImpl.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRecordServiceImpl.java
index 2cb2a35..68b67a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TRecordServiceImpl.java
@@ -159,7 +159,13 @@ public class TRecordServiceImpl implements ITRecordService
     {
 
         RecordHistoryDataResp recordHistoryDataResp = new RecordHistoryDataResp();
-        List<Date> dateList = records.stream().map(TRecord::getCreateTime).collect(Collectors.toList());
+        List<Date> dateList = records.stream().map(TRecord -> {
+            if (null != TRecord.getUpdateTime()) {
+                return TRecord.getUpdateTime();
+            } else {
+                return TRecord.getCreateTime();
+            }
+        }).collect(Collectors.toList());
         recordHistoryDataResp.setDateList(dateList);
         List<JSONObject> result = records.stream().map(tRecord -> {
             JSONObject jsonObject = new JSONObject();