搜索条件新增

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysUserController.java

@@ -175,6 +175,11 @@ public class SysUserController extends BaseController
     @PostMapping("/edit")
     public AjaxResult edit(@Validated @RequestBody SysUserEditBo bo)
     {
+        if (bo.getStatus().equals(-1)){
+            SysUser user = BeanUtil.toBean(bo, SysUser.class);
+            int result = userService.updateUser(user);
+            return toAjax(result);
+        }
         SysUser user = BeanUtil.toBean(bo, SysUser.class);
         userService.checkUserAllowed(user);
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/SysRole.java

@@ -40,21 +40,21 @@ public class SysRole implements Serializable
     /** 角色名称 */
     @ApiModelProperty(value ="角色名称")
     @Excel(name = "角色名称")
-    //@NotBlank(message = "角色名称不能为空")
+    @NotBlank(message = "角色名称不能为空")
     @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
     private String roleName;
 
     /** 角色权限 */
     @ApiModelProperty(value ="权限字符")
     @Excel(name = "角色权限")
-    //@NotBlank(message = "权限字符不能为空")
+    @NotBlank(message = "权限字符不能为空")
     @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
     private String roleKey;
 
     /** 角色排序 */
     @ApiModelProperty(value ="角色排序")
     @Excel(name = "角色排序")
-    //@NotBlank(message = "显示顺序不能为空")
+    @NotBlank(message = "显示顺序不能为空")
     private String roleSort;
 
     /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */