From dbb7ce4c296cc0934392ef6da9beb2de946fc8ba Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 21 三月 2023 20:27:00 +0800
Subject: [PATCH] !306 规范不公开方法访问控制修饰符为private Merge pull request !306 from Yjoioooo/5.X
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
index 2d9d7cd..4a3cf03 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
@@ -4,7 +4,6 @@
import cn.dev33.satoken.annotation.SaCheckRole;
import com.baomidou.lock.annotation.Lock4j;
import com.ruoyi.common.core.constant.TenantConstants;
-import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.validate.AddGroup;
@@ -18,7 +17,6 @@
import com.ruoyi.common.tenant.helper.TenantHelper;
import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.system.domain.bo.SysTenantBo;
-import com.ruoyi.system.domain.bo.SysUserBo;
import com.ruoyi.system.domain.vo.SysTenantVo;
import com.ruoyi.system.service.ISysTenantService;
import com.ruoyi.system.service.ISysUserService;
@@ -91,14 +89,8 @@
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
- if (TenantConstants.NOT_PASS.equals(sysTenantService.checkCompanyNameUnique(bo))) {
+ if (!sysTenantService.checkCompanyNameUnique(bo)) {
throw new ServiceException("鏂板绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屼紒涓氬悕绉板凡瀛樺湪");
- }
- SysUserBo userBo = new SysUserBo();
- userBo.setUserName(bo.getUsername());
- // 鍒ゆ柇鐢ㄦ埛鍚嶆槸鍚﹂噸澶�
- if (UserConstants.NOT_UNIQUE.equals(sysUserService.checkUserNameUnique(userBo))) {
- throw new ServiceException("鏂板鐢ㄦ埛'" + bo.getUsername() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
return toAjax(sysTenantService.insertByBo(bo));
}
@@ -112,7 +104,8 @@
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
- if (UserConstants.NOT_UNIQUE.equals(sysTenantService.checkCompanyNameUnique(bo))) {
+ sysTenantService.checkTenantAllowed(bo.getTenantId());
+ if (!sysTenantService.checkCompanyNameUnique(bo)) {
throw new ServiceException("淇敼绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屽叕鍙稿悕绉板凡瀛樺湪");
}
return toAjax(sysTenantService.updateByBo(bo));
@@ -126,6 +119,7 @@
@Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
+ sysTenantService.checkTenantAllowed(bo.getTenantId());
return toAjax(sysTenantService.updateTenantStatus(bo));
}
--
Gitblit v1.9.3