Merge branch 'zx_saas_message' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -566,7 +566,12 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			messageParam.setType(type.getCode());
 			messageParam.setUrl(url);
 			Map<Long, String> params = new HashMap<>();
-			params.put(userId, Optional.ofNullable(receive.getValue()).orElse(user.getPhone()));
+			if(messageSender == MessageSender.EMAIL){
+				//如果是极光推送，没有用户ID的情况下，使用手机号
+				params.put(userId, Optional.ofNullable(receive.getValue()).orElse(user.getPhone()));
+			}else {
+				params.put(userId, Optional.ofNullable(user.getPhone()).orElse(receive.getValue()));
+			}
 			messageParam.setReceivers(params);
 			messageParam.setRealSend(!debugMode);
 			if(args != null && args.length > 0){
@@ -633,7 +638,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			CbsMessageWrapper.MessageParam messageParam = new CbsMessageWrapper.MessageParam();
 			messageParam.setUserId(user.getUserId().longValue());
 			messageParam.setAppKey(EAppKey.GYM);
-			messageParam.setClientType(EClientType.STUDENT);
+			messageParam.setClientType(EClientType.valueOf(jpushType));
 			messageParam.setClientId(messageParam.getClientType());
 			messageParam.setType(type.getCode());
 			messageParam.setUrl(url);