Merge remote-tracking branch 'origin/saas' into saas

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

@@ -454,9 +454,11 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if (StringUtils.isBlank(receiver)) {
 			throw new BizException("接收地址不能为空");
 		}
+		SimpleUserDto simpleUserDto = teacherDao.getSimpleUser(userId);
+		TenantContextHolder.setTenantId(simpleUserDto.getTenantId());
 		// email data from database load
 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) {
-			loadEmailInfo(userId);
+			loadEmailInfo(simpleUserDto.getTenantId());
 			debugMode = false;
 			LOGGER.info("batch 发送邮件 {} ", userId);
 		}
@@ -498,6 +500,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 				LOGGER.error("未找到邮件配置 tenantId" + tenantId);
 				throw new RuntimeException("未找到邮件配置 tenantId" + tenantId);
 			}
+
 			messageSenderPluginContext.sysEmail.setHostName(email1.getHostName());
 			messageSenderPluginContext.sysEmail.setSmtpPort(email1.getSmtpPort());
 			messageSenderPluginContext.sysEmail.setUserName(email1.getUserName());