From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
index aa57443..1f7eebf 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -97,10 +97,14 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderCharteredCarMapper.queryMyOrderList(uid, pageNum, size);
for (Map<String, Object> map : maps) {
- String orderTime = map.get("orderTime").toString();
- map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return maps;
}
--
Gitblit v1.7.1