ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-10 20:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复修改存储时同时设置默认存储及启用判断顺序错误

Browse Source
This commit is contained in:
Charles7c
2024-09-24 22:33:21 +08:00
parent ad69d44ebd
commit d9602e8639
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java
View File

@@ -83,6 +83,11 @@ public class StorageServiceImpl extends BaseServiceImpl<StorageMapper, StorageDO
.equals(newStatus), "[{}] 是默认存储，不允许禁用", oldStorage.getName());
this.decodeSecretKey(req, oldStorage);
DisEnableStatusEnum oldStatus = oldStorage.getStatus();
if (Boolean.TRUE.equals(req.getIsDefault())) {
CheckUtils.throwIf(this.isDefaultExists(id), "请先取消原有默认存储");
CheckUtils.throwIf(!DisEnableStatusEnum.ENABLE.equals(oldStatus) && !DisEnableStatusEnum.ENABLE
.equals(newStatus), "请先启用该存储");
}
// 先卸载
if (DisEnableStatusEnum.ENABLE.equals(oldStatus)) {
this.unload(BeanUtil.copyProperties(oldStorage, StorageReq.class));
@@ -91,10 +96,6 @@ public class StorageServiceImpl extends BaseServiceImpl<StorageMapper, StorageDO
if (DisEnableStatusEnum.ENABLE.equals(newStatus)) {
this.load(req);
}
if (Boolean.TRUE.equals(req.getIsDefault())) {
CheckUtils.throwIf(!DisEnableStatusEnum.ENABLE.equals(oldStatus), "请先启用该存储");
CheckUtils.throwIf(this.isDefaultExists(id), "请先取消原有默认存储");
}
}
@Override