From 94a18018ae0670383af4921b0fd7afd32a6b7b65 Mon Sep 17 00:00:00 2001
From: hmb <hmb@qq.com>
Date: Tue, 26 Nov 2024 18:38:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(tenant):=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 针对执行结果为 null 的情况增加了日志记录
- 为了避免 ConcurrentHashMap put空指针异常，将 result 设置为空字符串
---
 .../yudao/framework/tenant/core/job/TenantJobAspect.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java
index 135b3cc3f..3a9e660a3 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/job/TenantJobAspect.java
@@ -50,6 +50,12 @@ public class TenantJobAspect {
             TenantUtils.execute(tenantId, () -> {
                 try {
                     Object result = joinPoint.proceed();
+                    if(null == result){
+                        XxlJobHelper.log(StrUtil.format("[多租户({}) 执行任务({})，结果为：null]",
+                                tenantId, joinPoint.getSignature()));
+                        //避免ConcurrentHashMap put空指针异常
+                        result = "";
+                    }
                     results.put(tenantId, StrUtil.toStringOrEmpty(result));
                 } catch (Throwable e) {
                     results.put(tenantId, ExceptionUtil.getRootCauseMessage(e));