diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java index eb0135e4..82a9180d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java @@ -5,6 +5,8 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.system.domain.SysClient; @@ -23,7 +25,7 @@ public class SysClientBo extends BaseEntity { /** * id */ - @NotNull(message = "id不能为空") + @NotNull(message = "id不能为空", groups = { EditGroup.class }) private Long id; /** @@ -34,19 +36,19 @@ public class SysClientBo extends BaseEntity { /** * 客户端key */ - @NotBlank(message = "客户端key不能为空") + @NotBlank(message = "客户端key不能为空", groups = { AddGroup.class, EditGroup.class }) private String clientKey; /** * 客户端秘钥 */ - @NotBlank(message = "客户端秘钥不能为空") + @NotBlank(message = "客户端秘钥不能为空", groups = { AddGroup.class, EditGroup.class }) private String clientSecret; /** * 授权类型 */ - @NotNull(message = "授权类型不能为空") + @NotNull(message = "授权类型不能为空", groups = { AddGroup.class, EditGroup.class }) private List grantTypeList; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java index 56c40faa..4affa64d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java @@ -23,7 +23,6 @@ public class SysConfigBo extends BaseEntity { /** * 参数主键 */ - @NotNull(message = "参数主键不能为空") private Long configId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 9b2951e8..a5031d7f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -24,7 +24,6 @@ public class SysDeptBo extends BaseEntity { /** * 部门id */ - @NotNull(message = "部门id不能为空") private Long deptId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java index 24a86c17..042946ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java @@ -23,7 +23,6 @@ public class SysDictDataBo extends BaseEntity { /** * 字典编码 */ - @NotNull(message = "字典编码不能为空") private Long dictCode; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java index 90294fe3..cfc82de7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java @@ -24,7 +24,6 @@ public class SysDictTypeBo extends BaseEntity { /** * 字典主键 */ - @NotNull(message = "字典主键不能为空") private Long dictId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java index 751a49ad..498280a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java @@ -24,7 +24,6 @@ public class SysMenuBo extends BaseEntity { /** * 菜单ID */ - @NotNull(message = "菜单ID不能为空") private Long menuId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java index 6a004f28..cdcc5750 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java @@ -2,7 +2,6 @@ package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,7 +23,6 @@ public class SysNoticeBo extends BaseEntity { /** * 公告ID */ - @NotNull(message = "公告ID不能为空") private Long noticeId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java index 1a5160aa..b93c39cd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java @@ -23,7 +23,6 @@ public class SysPostBo extends BaseEntity { /** * 岗位ID */ - @NotNull(message = "岗位ID不能为空") private Long postId; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java index 788973ca..0c8b4dca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java @@ -26,7 +26,6 @@ public class SysRoleBo extends BaseEntity { /** * 角色ID */ - @NotNull(message = "角色ID不能为空") private Long roleId; /**