From 6473d4d8be63f2d18db9a8f7c4b0096ee4dd6d55 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 13 八月 2021 17:36:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java |    2 +-
 1 files changed, 1 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 1de76ae..95f0869 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,7 @@
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
     	if(isValid) {
-			if (CollUtil.containsAll(ids, CollUtil.newArrayList(1, 2, 3, 4))) {
+			if (CollUtil.containsAny(ids, CollUtil.newArrayList(1, 2, 3, 4))) {
 				throw new CustomException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
 			}
 		}

--
Gitblit v1.9.3