From 0282776d0987963457035d59633b77a80975acc8 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 24 Dec 2022 01:36:38 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/resource/builder/oss/OssBuilder.java | 2 +- .../java/org/springblade/resource/builder/sms/SmsBuilder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java index 8283ceb4..13fef787 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java @@ -136,7 +136,7 @@ public class OssBuilder { Oss oss = CacheUtil.get(RESOURCE_CACHE, OSS_CODE, key, () -> { Oss o = ossService.getOne(lqw); // 若为空则调用默认配置 - if ((Func.isEmpty(o))) { + if (o == null || o.getId() == null) { Oss defaultOss = new Oss(); defaultOss.setId(0L); defaultOss.setCategory(OssEnum.of(ossProperties.getName()).getCategory()); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java index d17d7299..57fdb720 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java @@ -133,7 +133,7 @@ public class SmsBuilder { Sms sms = CacheUtil.get(RESOURCE_CACHE, SMS_CODE, key, () -> { Sms s = smsService.getOne(lqw); // 若为空则调用默认配置 - if ((Func.isEmpty(s))) { + if (s == null || s.getId() == null) { Sms defaultSms = new Sms(); defaultSms.setId(0L); defaultSms.setTemplateId(smsProperties.getTemplateId());