diff --git a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java index 3e2e7f74..6604f657 100644 --- a/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java +++ b/src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java @@ -27,6 +27,9 @@ public class UserPageQuery extends BasePageQuery { @Schema(description="部门ID") private Long deptId; + @Schema(description = "角色ID") + private List roleIds; + @Schema(description="创建时间范围") private List createTime; diff --git a/src/main/resources/mapper/system/UserMapper.xml b/src/main/resources/mapper/system/UserMapper.xml index 988b7f07..a9a7feef 100644 --- a/src/main/resources/mapper/system/UserMapper.xml +++ b/src/main/resources/mapper/system/UserMapper.xml @@ -47,6 +47,12 @@ AND u.create_time <= #{endDate} + + AND sur.role_id IN + + #{roleId} + + GROUP BY u.id