From 0ec6fbd34ca4633a415e17ee50450f12e815a4aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 三月 2023 23:29:05 +0800
Subject: [PATCH] fix 修复 管理租户被修改导致无法登录超管账号问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java
index f4b325a..b805911 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java
@@ -1,21 +1,21 @@
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.web.core.BaseController;
-import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.mybatis.core.page.TableDataInfo;
-import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.web.core.BaseController;
+import com.ruoyi.system.domain.bo.SysConfigBo;
+import com.ruoyi.system.domain.vo.SysConfigVo;
import com.ruoyi.system.service.ISysConfigService;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -36,7 +36,7 @@
*/
@SaCheckPermission("system:config:list")
@GetMapping("/list")
- public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
+ public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
return configService.selectPageConfigList(config, pageQuery);
}
@@ -46,9 +46,9 @@
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:config:export")
@PostMapping("/export")
- public void export(SysConfig config, HttpServletResponse response) {
- List<SysConfig> list = configService.selectConfigList(config);
- ExcelUtil.exportExcel(list, "鍙傛暟鏁版嵁", SysConfig.class, response);
+ public void export(SysConfigBo config, HttpServletResponse response) {
+ List<SysConfigVo> list = configService.selectConfigList(config);
+ ExcelUtil.exportExcel(list, "鍙傛暟鏁版嵁", SysConfigVo.class, response);
}
/**
@@ -58,7 +58,7 @@
*/
@SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
- public R<SysConfig> getInfo(@PathVariable Long configId) {
+ public R<SysConfigVo> getInfo(@PathVariable Long configId) {
return R.ok(configService.selectConfigById(configId));
}
@@ -78,8 +78,8 @@
@SaCheckPermission("system:config:add")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<Void> add(@Validated @RequestBody SysConfig config) {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+ public R<Void> add(@Validated @RequestBody SysConfigBo config) {
+ if (!configService.checkConfigKeyUnique(config)) {
return R.fail("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
configService.insertConfig(config);
@@ -92,8 +92,8 @@
@SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<Void> edit(@Validated @RequestBody SysConfig config) {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+ public R<Void> edit(@Validated @RequestBody SysConfigBo config) {
+ if (!configService.checkConfigKeyUnique(config)) {
return R.fail("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
configService.updateConfig(config);
@@ -106,7 +106,7 @@
@SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/updateByKey")
- public R<Void> updateByKey(@RequestBody SysConfig config) {
+ public R<Void> updateByKey(@RequestBody SysConfigBo config) {
configService.updateConfig(config);
return R.ok();
}
--
Gitblit v1.9.3