xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 08:13:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!314 遗漏数据验证后return

Browse Source 
Merge pull request !314 from Yjoioooo/5.X
This commit is contained in:
疯狂的狮子Li
2023-03-27 06:00:21 +00:00
committed by Gitee
parent 64cfb487d6 7dfa67c88c
commit c00c9ba386
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
View File

@@ -72,7 +72,7 @@ public class SysOssController extends BaseController {
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) { public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
if (ObjectUtil.isNull(file)) { if (ObjectUtil.isNull(file)) {
R.fail("上传文件不能为空"); return R.fail("上传文件不能为空");
} }
SysOssVo oss = ossService.upload(file); SysOssVo oss = ossService.upload(file);
SysOssUploadVo uploadVo = new SysOssUploadVo(); SysOssUploadVo uploadVo = new SysOssUploadVo();

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
View File

@@ -89,7 +89,7 @@ public class SysTenantController extends BaseController {
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
if (!tenantService.checkCompanyNameUnique(bo)) { if (!tenantService.checkCompanyNameUnique(bo)) {
R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
} }
return toAjax(tenantService.insertByBo(bo)); return toAjax(tenantService.insertByBo(bo));
} }
@@ -105,7 +105,7 @@ public class SysTenantController extends BaseController {
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
tenantService.checkTenantAllowed(bo.getTenantId()); tenantService.checkTenantAllowed(bo.getTenantId());
if (!tenantService.checkCompanyNameUnique(bo)) { if (!tenantService.checkCompanyNameUnique(bo)) {
R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
} }
return toAjax(tenantService.updateByBo(bo)); return toAjax(tenantService.updateByBo(bo));
} }