From 011d53f9f3d08af8cd622585ce40eb880f313aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 25 九月 2019 12:02:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 d645020..17868de 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
@@ -58,6 +58,10 @@
 				updateDeviceActive.setDeviceToken(deviceActive.getDeviceToken());
 				updateDeviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
 			}
+
+			if (StringUtil.isNullOrEmpty(da.getMac()))
+				updateDeviceActive.setImei(deviceActive.getMac());
+
 			deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
 		}
 

--
Gitblit v1.8.0