From 0513fbff9475ede56fb96cab76f594c1450adc20 Mon Sep 17 00:00:00 2001 From: huk Date: Thu, 25 Sep 2025 10:50:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E6=9B=B4=E6=96=B0=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E6=A8=A1=E5=9D=97=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8E=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 SysTenant 和 SysTenantVo 中的 bearFeeFlag 字段类型由 Integer 改为 Boolean - 移除 SysTenant 中不再使用的 BigDecimal 导入 - 在 SysTenantController 的删除接口中调整 SaCheckRole 权限注解模式为 OR- 在 SysTenantExtendBo 中新增 bearFeeFlag 字段并更新 splitRatio 描述 --- .../org/dromara/system/controller/SysTenantController.java | 2 +- .../src/main/java/org/dromara/system/domain/SysTenant.java | 7 ++----- .../org/dromara/system/domain/bo/SysTenantExtendBo.java | 5 ++++- .../java/org/dromara/system/domain/vo/SysTenantVo.java | 5 +---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java index a792f8175..9e0f70b69 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java @@ -180,7 +180,7 @@ public class SysTenantController extends BaseController { */ @Tag(name = "删除租户表") @Log(title = "租户表", businessType = BusinessType.DELETE) - @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY}) + @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR) @SaCheckPermission("system:tenant:remove") @DeleteMapping("/remove") public R batchRemove(@RequestParam("ids") String ids) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java index 0e679a9df..6ba6b3f9c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java @@ -11,7 +11,6 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @@ -100,10 +99,8 @@ public class SysTenant extends BaseEntity { @Schema(description = "联系人手机号") private String contactPhone; - /** - * 是否承担手续费 - */ - private Integer bearFeeFlag; + @Schema(description = "是否承担手续费") + private Boolean bearFeeFlag; @Schema(description = "代理机构名称") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java index 677d0ce0a..107264c7a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java @@ -130,9 +130,12 @@ public class SysTenantExtendBo { @Schema(description = "签约日期") private LocalDateTime signDate; - @Schema(description = "分成比例") + @Schema(description = "分成比例模板") private String splitRatio; + @Schema(description = "分账是否承担手续费") + private Boolean bearFeeFlag; + @Schema(description = "签约人") private String signer; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java index 944d7cab5..52f8a0c0e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java @@ -161,11 +161,8 @@ public class SysTenantVo implements Serializable { @Schema(description = "签约状态(0.待审核1.有效 2.无效 3.编辑 4.过期)") private String signStatus; - /** - * 分账是否承担手续费 - */ @Schema(description = "分账是否承担手续费") - private Integer bearFeeFlag; + private Boolean bearFeeFlag; /** * 创建部门