From be8545029b0dfc76a7b74c57098d74672bbdaf95 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:15:46 +0800
Subject: [PATCH] 更新

---
 UserIGOTravel/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/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
index a944820..17ef305 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
+++ b/UserIGOTravel/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