| 
					
				 | 
			
			
				@@ -317,12 +317,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		Integer userId = receivers.keySet().iterator().next(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		Integer receiverTenantId = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		SimpleUserDto simpleUserDto = teacherDao.getSimpleUser(userId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		Integer receiverTenantId = simpleUserDto.getTenantId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if(simpleUserDto != null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			receiverTenantId = simpleUserDto.getTenantId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		// email data from database load, 使用接收者 tenantId, 假设发送者和接收者为同一机构 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if (Objects.equals(messageSender.getSendMode(), "EMAIL")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			LOGGER.info("batch 发送邮件 {} ", simpleUserDto.getTenantId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			LOGGER.info("batch 发送邮件 {} ", receiverTenantId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			loadEmailInfo(senderTenantId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			// debugMode = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 |