From c00c9ba386b367deb76fa438eaed9ef5dd371d03 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 三月 2023 14:00:21 +0800
Subject: [PATCH] !314 遗漏数据验证后return Merge pull request !314 from Yjoioooo/5.X
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 4a3cf03..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
@@ -41,8 +41,7 @@
@RequestMapping("/system/tenant")
public class SysTenantController extends BaseController {
- private final ISysTenantService sysTenantService;
- private final ISysUserService sysUserService;
+ private final ISysTenantService tenantService;
/**
* 鏌ヨ绉熸埛鍒楄〃
@@ -51,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);
}
/**
@@ -62,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);
}
@@ -76,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));
}
/**
@@ -89,10 +88,10 @@
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
- if (!sysTenantService.checkCompanyNameUnique(bo)) {
- throw new ServiceException("鏂板绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屼紒涓氬悕绉板凡瀛樺湪");
+ if (!tenantService.checkCompanyNameUnique(bo)) {
+ return R.fail("鏂板绉熸埛'" + bo.getCompanyName() + "'澶辫触锛屼紒涓氬悕绉板凡瀛樺湪");
}
- return toAjax(sysTenantService.insertByBo(bo));
+ return toAjax(tenantService.insertByBo(bo));
}
/**
@@ -104,11 +103,11 @@
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
- sysTenantService.checkTenantAllowed(bo.getTenantId());
- if (!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));
}
/**
@@ -119,8 +118,8 @@
@Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
- sysTenantService.checkTenantAllowed(bo.getTenantId());
- return toAjax(sysTenantService.updateTenantStatus(bo));
+ tenantService.checkTenantAllowed(bo.getTenantId());
+ return toAjax(tenantService.updateTenantStatus(bo));
}
/**
@@ -134,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));
}
/**
@@ -171,7 +170,7 @@
@Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
@GetMapping("/syncTenantPackage")
public R<Void> syncTenantPackage(@NotBlank(message = "绉熸埛ID涓嶈兘涓虹┖") String tenantId, @NotBlank(message = "濂楅ID涓嶈兘涓虹┖") String packageId) {
- return toAjax(sysTenantService.syncTenantPackage(tenantId, packageId));
+ return toAjax(tenantService.syncTenantPackage(tenantId, packageId));
}
}
--
Gitblit v1.9.3