Browse Source

fix 修复 编辑 OssConfig 在 postgres 字段重复报错 补全 remark 字段

疯狂的狮子li 3 years ago
parent
commit
45fd96cd0d

+ 6 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java

@@ -108,4 +108,10 @@ public class SysOssConfigBo extends BaseEntity {
     @ApiModelProperty(value = "扩展字段")
     @ApiModelProperty(value = "扩展字段")
     private String ext1;
     private String ext1;
 
 
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }
 }

+ 4 - 3
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java

@@ -95,9 +95,10 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
         SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
         SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
         validEntityBeforeSave(config);
         validEntityBeforeSave(config);
         LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
         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.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, "");
+        luw.set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, "");
+        luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, "");
+        luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, "");
         luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
         luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
         return setConfigCache(baseMapper.update(config, luw) > 0, config);
         return setConfigCache(baseMapper.update(config, luw) > 0, config);
     }
     }