@@ -15,4 +15,9 @@ public class RoleQuery extends BaseQuery { | |||
*/ | |||
private String roleName; | |||
/** | |||
* 角色状态1正常 2禁用 | |||
*/ | |||
private Integer status; | |||
} |
@@ -33,7 +33,7 @@ public class RoleListVo { | |||
private Integer status; | |||
/** | |||
* 备注 | |||
* 备注 用户描述 | |||
*/ | |||
private String remark; | |||
@@ -84,6 +84,10 @@ public class RoleServiceImpl implements IRoleService { | |||
if (!StringUtils.isEmpty(roleQuery.getRoleName())) { | |||
queryWrapper.like("role_name", roleQuery.getRoleName()); | |||
} | |||
//角色状态 | |||
if(roleQuery.getStatus() != null){ | |||
queryWrapper.eq("status", roleQuery.getStatus()); | |||
} | |||
queryWrapper.eq("mark", MarkEnum.VALID.getCode()); | |||
//queryWrapper.orderByAsc("sort"); | |||
queryWrapper.orderByAsc("create_time"); |