瀏覽代碼

修改查询用户分页列表,roleName字段数据

tags/v1.0.0^2
wanjing 1 年之前
父節點
當前提交
ae7f6e7cfe
共有 2 個文件被更改,包括 1 次插入6 次删除
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/user/query/QueryUserPageListService.java
  2. +0
    -5
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/user/UserPageListVo.java

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/user/query/QueryUserPageListService.java 查看文件

@@ -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));

+ 0
- 5
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/vo/user/UserPageListVo.java 查看文件

@@ -111,11 +111,6 @@ public class UserPageListVo {
*/
private String username;

/**
* 用户类型:1管理员
*/
private Integer type;

/**
* 驾照类型:1飞行执照 2飞行许可证
*/

Loading…
取消
儲存