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

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

@@ -442,6 +442,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 				return;
 			}
 		}
+		if(StringUtils.isEmpty(jpushType)){
+			jpushType = "STUDENT";
+		}
 		List<SimpleUserDto> userDtoList = teacherDao.getUsersSimpleInfo(new ArrayList<>(receivers.keySet()));
 		List<CbsMessageWrapper.MessageParam> messageParams = new ArrayList<>();
 		for (SimpleUserDto user : userDtoList) {
@@ -510,6 +513,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 				return;
 			}
 		}
+		if(StringUtils.isEmpty(jpushType)){
+			jpushType = "STUDENT";
+		}
 		List<SimpleUserDto> userDtoList = teacherDao.getUsersSimpleInfo(new ArrayList<>(receivers.keySet()));
 		List<CbsMessageWrapper.MessageParam> messageParams = new ArrayList<>();
 		for (SimpleUserDto user : userDtoList) {