Browse Source

优化资源管理默认参数判断逻辑

test
smallchill 2 years ago
parent
commit
0282776d09
  1. 2
      blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/OssBuilder.java
  2. 2
      blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/sms/SmsBuilder.java

2
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());

2
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());

Loading…
Cancel
Save