diff --git a/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java b/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java index d3bb786..d0f29c7 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java @@ -28,7 +28,6 @@ public class RoleVo implements Serializable { private Integer id; // 角色id private String roleName; // 角色名 private String roleKey; // 角色标识符 - private Integer priority;//优先级 private Integer fatherId;//上级角色id private String fatherName;//上级角色名称 private String market;//所属市场 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java index 895a4a6..fae36d3 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java @@ -59,12 +59,6 @@ public class RoleServiceImpl implements RoleService { } - if (roleVo.getPriority() == null) { - return Result.error("优先级为空"); - } - if (roleVo.getPriority() <= 0 || roleVo.getPriority() > 999) { - return Result.error("优先级不在1-999"); - } if (roleVo.getMenuIds() == null || roleVo.getMenuIds().isEmpty()) { return Result.error("权限为空"); } @@ -115,13 +109,6 @@ public class RoleServiceImpl implements RoleService { return Result.error("角色名重复"); } - - if (roleVo.getPriority() == null) { - return Result.error("优先级为空"); - } - if (roleVo.getPriority() <= 0 || roleVo.getPriority() > 999) { - return Result.error("优先级不在1-999"); - } if (roleVo.getMenuIds() == null || roleVo.getMenuIds().isEmpty()) { return Result.error("权限为空"); } else { diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index fe5cb51..e8a7096 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -56,7 +56,7 @@ INSERT INTO role - (role_name, priority, father_id, market) + (role_name,father_id, market) VALUES (#{roleName}, #{priority}, #{fatherId}, #{market}) @@ -73,7 +73,6 @@