From beb3fde96d285756ee6812cea6638c237d5a53be Mon Sep 17 00:00:00 2001 From: hmb Date: Thu, 5 Dec 2024 09:16:34 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(tenant):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 94a18018ae0670383af4921b0fd7afd32a6b7b65. --- .../yudao/framework/tenant/core/job/TenantJobAspect.java | 6 ------ 1 file changed, 6 deletions(-) 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 3a9e660a3..135b3cc3f 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,12 +50,6 @@ 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));