abu/wzj-boot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]:

Browse Source 
- 移除了提交签约、审核提交的签约和确认审核通过的签约接口中的 @SaCheckRole 注解
- 修复了审核未通过时未填写失败原因的逻辑判断
- 在提交签约时清空失败原因字段
This commit is contained in:
huCareYou 2025-08-26 13:44:52 +08:00
parent 7bb559d294
commit 8859977761
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java
View File

@ -133,8 +133,6 @@ public class SysTenantController extends BaseController {
/**
* 提交签约
*/
@Tag(name ="提交签约")
@SaCheckRole(TenantConstants.TENANT_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:submitSign")
@Log(title = "租户管理", businessType = BusinessType.UPDATE)
@PostMapping("/submitSign/{tenantId}")
@ -146,8 +144,6 @@ public class SysTenantController extends BaseController {
/**
* 审核提交的签约
*/
@Tag(name ="审核提交的签约")
@SaCheckRole(TenantConstants.TENANT_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:reviewSubmitted")
@Log(title = "租户管理", businessType = BusinessType.UPDATE)
@PostMapping("/reviewSubmitted")
@ -160,8 +156,6 @@ public class SysTenantController extends BaseController {
/**
* 确认审核通过的签约
*/
@Tag(name ="确认审核通过的签约")
@SaCheckRole(TenantConstants.TENANT_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:confirmedSign")
@Log(title = "租户管理", businessType = BusinessType.UPDATE)
@PostMapping("/confirmedSign/{tenantId}")

3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
View File

@ -800,6 +800,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
SysTenantExtend updateTenantExtend = new SysTenantExtend();
updateTenantExtend.setId(tenantExtend.getId());
updateTenantExtend.setSignStatus(TenantSignStatus.TO_BE_REVIEWED.getStatus());
updateTenantExtend.setFailureReason("");
return tenantExtendMapper.updateById(updateTenantExtend);
}
@ -809,7 +810,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
Assert.notNull(tenantExtend, () -> new ServiceException("无效的租户信息"));
Assert.isTrue(TenantSignStatus.TO_BE_REVIEWED.getStatus().equals(tenantExtend.getSignStatus()), () -> new ServiceException("当前状态不可审核"));
Boolean isPass = bo.getIsPass();
Assert.isTrue(!isPass && StrUtil.isNotBlank(bo.getFailureReason()), () -> new ServiceException("请填写审核未通过原因"));
Assert.isTrue(isPass || StrUtil.isNotBlank(bo.getFailureReason()), () -> new ServiceException("请填写审核未通过原因"));
SysTenantExtend updateTenantExtend = new SysTenantExtend();
updateTenantExtend.setId(tenantExtend.getId());
if (isPass) {