!313 修改controller中校验直接返回R.fail Merge pull request !313 from Yjoioooo/5.X

疯狂的狮子Li

2023-03-27 64cfb487d642b0d336d6542f66d8db59acabf055

!313 修改controller中校验直接返回R.fail
Merge pull request !313 from Yjoioooo/5.X

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

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

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

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