Browse Source

:bug: Fixing a bug.fix sys role validate

萌萌哒Sakura酱 6 years ago
parent
commit
bc89441349

+ 2 - 1
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<SysRole> {
 	@NotBlank(message = "角色描述 不能为空")
 	private String roleDesc;
 
-	@NotBlank(message = "数据权限类型 不能为空")
+	@NotNull(message = "数据权限类型 不能为空")
 	private Integer dsType;
 
 	private String dsScope;

+ 4 - 2
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));
 	}