@@ -155,7 +155,7 @@ public class QueryUserPageListService { | |||
if (CollectionUtil.isEmpty(userList)) { | |||
return null; | |||
} | |||
List<String> roleIdList = userList.stream().map(o -> o.getDeptId()).collect(Collectors.toList()); | |||
List<Integer> roleIdList = userList.stream().map(o -> o.getRoleId()).collect(Collectors.toList()); | |||
List<Role> roleList = roleMapper.selectList(new LambdaQueryWrapper<Role>() | |||
.in(Role::getId, roleIdList) | |||
.eq(Role::getMark, 1)); |
@@ -111,11 +111,6 @@ public class UserPageListVo { | |||
*/ | |||
private String username; | |||
/** | |||
* 用户类型:1管理员 | |||
*/ | |||
private Integer type; | |||
/** | |||
* 驾照类型:1飞行执照 2飞行许可证 | |||
*/ |