From 2e1761423d68243ea06b712f064bff7097c23584 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 七月 2021 20:05:15 +0800
Subject: [PATCH] fix 修复 DictData 删除逻辑问题

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 2376d8b..eee0595 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -20,6 +20,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -31,9 +32,6 @@
  */
 @Service
 public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
-
-	@Autowired
-	private SysConfigMapper configMapper;
 
 	@Autowired
 	private RedisCache redisCache;
@@ -93,6 +91,20 @@
 			return retConfig.getConfigValue();
 		}
 		return StrUtil.EMPTY;
+	}
+
+	/**
+	 * 鑾峰彇楠岃瘉鐮佸紑鍏�
+	 *
+	 * @return true寮�鍚紝false鍏抽棴
+	 */
+	@Override
+	public boolean selectCaptchaOnOff() {
+		String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
+		if (StrUtil.isEmpty(captchaOnOff)) {
+			return true;
+		}
+		return Convert.toBool(captchaOnOff);
 	}
 
 	/**
@@ -160,9 +172,9 @@
 			if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
 				throw new CustomException(String.format("鍐呯疆鍙傛暟銆�%1$s銆戜笉鑳藉垹闄� ", config.getConfigKey()));
 			}
-			configMapper.deleteById(configId);
 			redisCache.deleteObject(getCacheKey(config.getConfigKey()));
 		}
+		baseMapper.deleteBatchIds(Arrays.asList(configIds));
 	}
 
 	/**

--
Gitblit v1.9.3