From 7dfa67c88cda91e505e6136c324d73bd3aa5fbda Mon Sep 17 00:00:00 2001
From: Yjoioooo <693337446@qq.com>
Date: 星期一, 27 三月 2023 13:58:49 +0800
Subject: [PATCH] fix 遗漏数据验证后return
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 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 5a582ca..5b264bd 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;
@@ -43,8 +41,7 @@
@RequestMapping("/system/tenant")
public class SysTenantController extends BaseController {
- private final ISysTenantService sysTenantService;
- private final ISysUserService sysUserService;
+ private final ISysTenantService tenantService;
/**
* 鏌ヨ绉熸埛鍒楄〃
@@ -53,7 +50,7 @@
@SaCheckPermission("system:tenant:list")
@GetMapping("/list")
public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
- return sysTenantService.queryPageList(bo, pageQuery);
+ return tenantService.queryPageList(bo, pageQuery);
}
/**
@@ -64,7 +61,7 @@
@Log(title = "绉熸埛", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysTenantBo bo, HttpServletResponse response) {
- List<SysTenantVo> list = sysTenantService.queryList(bo);
+ List<SysTenantVo> list = tenantService.queryList(bo);
ExcelUtil.exportExcel(list, "绉熸埛", SysTenantVo.class, response);
}
@@ -78,7 +75,7 @@
@GetMapping("/{id}")
public R<SysTenantVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long id) {
- return R.ok(sysTenantService.queryById(id));
+ return R.ok(tenantService.queryById(id));
}
/**
@@ -91,16 +88,10 @@
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
- if (TenantConstants.NOT_PASS.equals(sysTenantService.checkCompanyNameUnique(bo))) {
- throw new ServiceException("鏂板绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屼紒涓氬悕绉板凡瀛樺湪");
+ if (!tenantService.checkCompanyNameUnique(bo)) {
+ return R.fail("鏂板绉熸埛'" + 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));
+ return toAjax(tenantService.insertByBo(bo));
}
/**
@@ -112,21 +103,23 @@
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
- if (UserConstants.NOT_UNIQUE.equals(sysTenantService.checkCompanyNameUnique(bo))) {
- throw new ServiceException("淇敼绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屽叕鍙稿悕绉板凡瀛樺湪");
+ tenantService.checkTenantAllowed(bo.getTenantId());
+ if (!tenantService.checkCompanyNameUnique(bo)) {
+ return R.fail("淇敼绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屽叕鍙稿悕绉板凡瀛樺湪");
}
- return toAjax(sysTenantService.updateByBo(bo));
+ return toAjax(tenantService.updateByBo(bo));
}
/**
* 鐘舵�佷慨鏀�
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
- @SaCheckPermission("system:tenantPackage:edit")
- @Log(title = "绉熸埛濂楅", businessType = BusinessType.UPDATE)
+ @SaCheckPermission("system:tenant:edit")
+ @Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
- return toAjax(sysTenantService.updateTenantStatus(bo));
+ tenantService.checkTenantAllowed(bo.getTenantId());
+ return toAjax(tenantService.updateTenantStatus(bo));
}
/**
@@ -140,7 +133,7 @@
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ids) {
- return toAjax(sysTenantService.deleteWithValidByIds(List.of(ids), true));
+ return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true));
}
/**
@@ -165,4 +158,19 @@
return R.ok();
}
+
+ /**
+ * 鍚屾绉熸埛濂楅
+ *
+ * @param tenantId 绉熸埛id
+ * @param packageId 濂楅id
+ */
+ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+ @SaCheckPermission("system:tenant:edit")
+ @Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
+ @GetMapping("/syncTenantPackage")
+ public R<Void> syncTenantPackage(@NotBlank(message = "绉熸埛ID涓嶈兘涓虹┖") String tenantId, @NotBlank(message = "濂楅ID涓嶈兘涓虹┖") String packageId) {
+ return toAjax(tenantService.syncTenantPackage(tenantId, packageId));
+ }
+
}
--
Gitblit v1.9.3