From bc89441349295238f7c94d2f293eb862b66d1b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92Sakura=E9=85=B1?= Date: Sat, 29 Dec 2018 16:57:27 +0800 Subject: [PATCH] :bug: Fixing a bug.fix sys role validate --- .../java/com/pig4cloud/pigx/admin/api/entity/SysRole.java | 3 ++- .../com/pig4cloud/pigx/admin/controller/RoleController.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index e08f8e23f..9cf07859b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -28,6 +28,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDateTime; @@ -58,7 +59,7 @@ public class SysRole extends Model { @NotBlank(message = "角色描述 不能为空") private String roleDesc; - @NotBlank(message = "数据权限类型 不能为空") + @NotNull(message = "数据权限类型 不能为空") private Integer dsType; private String dsScope; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index cf42d5438..a477b90df 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -31,6 +31,8 @@ import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; + /** * @author lengleng * @date 2017/11/5 @@ -63,7 +65,7 @@ public class RoleController { @SysLog("添加角色") @PostMapping @PreAuthorize("@pms.hasPermission('sys_role_add')") - public R save(@RequestBody SysRole sysRole) { + public R save(@Valid @RequestBody SysRole sysRole) { return new R<>(sysRoleService.save(sysRole)); } @@ -76,7 +78,7 @@ public class RoleController { @SysLog("修改角色") @PutMapping @PreAuthorize("@pms.hasPermission('sys_role_edit')") - public R update(@RequestBody SysRole sysRole) { + public R update(@Valid @RequestBody SysRole sysRole) { return new R<>(sysRoleService.updateById(sysRole)); }