From d06bbceccd3469a0aedce0ed6276916f44e2b194 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期五, 26 一月 2024 17:53:06 +0800
Subject: [PATCH] 1.27
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
index 8132cec..6078d76 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
@@ -59,8 +59,10 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> query = incomeMapper.query(userType, objectId, type, pageNum, size);
for (Map<String, Object> map : query) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return query;
}
--
Gitblit v1.7.1