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 dateList = records.stream().map(TRecord::getCreateTime).collect(Collectors.toList()); + List dateList = records.stream().map(TRecord -> { + if (null != TRecord.getUpdateTime()) { + return TRecord.getUpdateTime(); + } else { + return TRecord.getCreateTime(); + } + }).collect(Collectors.toList()); recordHistoryDataResp.setDateList(dateList); List result = records.stream().map(tRecord -> { JSONObject jsonObject = new JSONObject();