From f1b34753044b88cf10d21aba80e728cc1dfb5e66 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 二月 2024 10:54:12 +0800
Subject: [PATCH] 修改
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.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/OrderCancelServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
index 87d67bb..f021996 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
@@ -82,8 +82,10 @@
public List<Map<String, Object>> queryCancel(Integer language, Integer uid, Integer isPay) throws Exception {
List<Map<String, Object>> list = orderCancelMapper.queryCancel(uid, isPay);
for (Map<String, Object> map : list) {
- 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 list;
}
--
Gitblit v1.7.1