From b8d10b6ae86e2252f650991835293d087ded0d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 28 Aug 2025 19:49:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(email):=20=E6=B7=BB=E5=8A=A0=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=20ID=E5=B9=B6=E6=9B=B4=E6=96=B0=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 EmailRecordService 接口中，更新 sendEmail 方法签名，添加 tenantId 参数
- 在 EmailRecordServiceImpl 中实现更新后的 sendEmail 方法，增加租户 ID 设置
- 修改 MainController 和 TenantServiceImpl 中调用 sendEmail 方法，传入租户 ID
---
 .../com/gxwebsoft/common/system/controller/MainController.java | 2 +-
 .../gxwebsoft/common/system/service/EmailRecordService.java    | 2 +-
 .../common/system/service/impl/EmailRecordServiceImpl.java     | 3 ++-
 .../common/system/service/impl/TenantServiceImpl.java          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index fc8d593..cfa84a1 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -651,7 +651,7 @@ public class MainController extends BaseController {
         String content = title + appUrl + appName + passwordStr;
         // 发送邮件通知
         if (email != null) {
-          emailRecordService.sendEmail(title, content, email);
+          emailRecordService.sendEmail(title, content, email, addUser.getTenantId());
         }
         return success("注册成功", new LoginResult(access_token, addUser));
       }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java b/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java
index b99a195..25ec4c2 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java
@@ -47,5 +47,5 @@ public interface EmailRecordService extends IService<EmailRecord> {
     void sendHtmlEmail(String title, String path, Map<String, Object> map, String[] toEmails)
             throws MessagingException, IOException;
 
-    void sendEmail(String title, String content, String receiver);
+    void sendEmail(String title, String content, String receiver, Integer tenantId);
 }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java
index 13ecae2..ec645c4 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java
@@ -72,13 +72,14 @@ public class EmailRecordServiceImpl extends ServiceImpl<EmailRecordMapper, Email
 
     @Async
     @Override
-    public void sendEmail(String title, String content, String receiver) {
+    public void sendEmail(String title, String content, String receiver, Integer tenantId) {
       // 发送邮件通知
       EmailRecord emailRecord = new EmailRecord();
       emailRecord.setTitle(title);
       emailRecord.setContent(content);
       emailRecord.setReceiver(receiver);
       emailRecord.setCreateUserId(42);
+      emailRecord.setTenantId(tenantId);
       sendTextEmail(title,content,receiver.split(","));
       save(emailRecord);
     }
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
index f0fd8fb..c198652 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -600,7 +600,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
       String content = title + appUrl + appName + adminUrl + account + password;
       // 发送邮件通知
       if (company.getEmail() != null) {
-        emailRecordService.sendEmail(title, content, company.getEmail());
+        emailRecordService.sendEmail(title, content, company.getEmail(), company.getTid());
       }
       return company;
     }