From 3b5fb07c3d8340feab01c09af8ab973a497b5e02 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 07 九月 2021 13:49:53 +0800
Subject: [PATCH] Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
index e802525..0b11f83 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
@@ -88,7 +88,12 @@
     public Boolean updateByBo(SysOssConfigBo bo) {
         SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
         validEntityBeforeSave(config);
-		return setConfigCache(updateById(config), config);
+		LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
+		luw.set(StringUtils.isBlank(config.getPrefix()), SysOssConfig::getPrefix, "");
+		luw.set(StringUtils.isBlank(config.getRegion()), SysOssConfig::getRegion, "");
+		luw.set(StringUtils.isBlank(config.getExt1()), SysOssConfig::getExt1, "");
+		luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
+		return setConfigCache(update(config, luw), config);
     }
 
     /**

--
Gitblit v1.9.3