用户管理增加角色名称的下拉检索查询

tz-module-system/tz-module-system-biz/src/main/java/cn/start/tz/module/system/controller/admin/user/vo/user/UserPageReqVO.java

@@ -9,6 +9,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -35,8 +36,8 @@ public class UserPageReqVO extends PageParam {
     @Schema(description = "部门编号，同时筛选子部门", example = "1024")
     private String deptId;
 
-    @Schema(description = "角色编号", example = "1024")
-    private String roleId;
+    @Schema(description = "角色编号（支持多选）", example = "[\"1024\", \"1025\"]")
+    private List<String> roleIds;
 
     @Schema(description = "角色标识", example = "1024")
     private String roleCode;

tz-module-system/tz-module-system-biz/src/main/java/cn/start/tz/module/system/service/user/AdminUserServiceImpl.java

@@ -299,8 +299,8 @@ public class AdminUserServiceImpl implements AdminUserService {
     @Override
     public PageResult<AdminUserDO> getUserPage(UserPageReqVO reqVO) {
         // 如果有角色编号，查询角色对应的用户编号
-        Set<String> userIds = reqVO.getRoleId() != null ?
-                permissionService.getUserRoleIdListByRoleId(singleton(reqVO.getRoleId())) : null;
+        Set<String> userIds = CollUtil.isNotEmpty(reqVO.getRoleIds()) ?
+                permissionService.getUserRoleIdListByRoleId(new HashSet<>(reqVO.getRoleIds())) : null;
 
         Set<String> userIds2 = reqVO.getRoleCode() != null ?
                 permissionService.getUserRoleIdListByRoleCode(singleton(reqVO.getRoleCode())) : null;