From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
index cddcff5..448a51d 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
@@ -33,10 +33,14 @@
public List<Map<String, Object>> query(Integer language, Integer companyId) throws Exception {
List<Map<String, Object>> query = userActivityRegisteredMapper.query(companyId);
for (Map<String, Object> map : query) {
- String startTime = map.get("startTime").toString();
- map.put("startTime", DateUtil.conversionFormat(language, startTime));
- String endTime = map.get("endTime").toString();
- map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ if(null != map.get("startTime")){
+ String startTime = map.get("startTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ }
+ if(null != map.get("endTime")){
+ String endTime = map.get("endTime").toString();
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ }
}
return query;
}
--
Gitblit v1.7.1