From b850eee6e58029b45ada7a21a8b52d3ecb177850 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 11:18:39 +0800
Subject: [PATCH] 测试环境取消活跃消息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
index c2c67cd..95b664e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
@@ -38,8 +38,10 @@
 				deviceActive.getPlatform());
 		if (da == null) {
 			deviceActive.setId(null);
-			deviceActive.setUpdateTime(new Date());
-			deviceActive.setCreateTime(new Date());
+			if (deviceActive.getUpdateTime() == null)
+				deviceActive.setUpdateTime(new Date());
+			if (deviceActive.getCreateTime() == null)
+				deviceActive.setCreateTime(new Date());
 			if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
 				deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
 			}

--
Gitblit v1.8.0