Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

角色筛选优化

Browse Source
This commit is contained in:
hongawen
2024-05-29 19:33:46 +08:00
parent a8a5d58c26
commit 8e97578259
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java
View File

@@ -100,7 +100,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
@Override
public List<String> getCodeByList(List<String> list) {
return this.lambdaQuery().in(Role::getId,list).list().stream().map(Role::getCode).distinct().collect(Collectors.toList());
return this.lambdaQuery().in(Role::getId, list).list().stream().map(Role::getCode).distinct().collect(Collectors.toList());
}
@Override
@@ -115,10 +115,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
}
queryWrapper.ne("sys_role.state", DataStateEnum.DELETED.getCode());
if (queryParam.getType().equals(0)){
queryWrapper.in("sys_role.type", queryParam.getType(),1);
}else if(queryParam.getType().equals(1)){
queryWrapper.eq("sys_role.type",2);
if (queryParam.getType().equals(0)) {
queryWrapper.in("sys_role.type", queryParam.getType(), 1);
} else if (queryParam.getType().equals(1)) {
queryWrapper.eq("sys_role.type", 2);
}
//初始化分页数据
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
@@ -127,7 +127,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
@Override
public List<Role> selectRoleDetail(Integer id) {
List<Integer> role = new ArrayList<>();
if (Objects.equals(id, RoleType.SUPER_ADMINISTRATOR)){
if (Objects.equals(id, RoleType.SUPER_ADMINISTRATOR)) {
role.add(RoleType.ADMINISTRATOR);
} else {
role.add(RoleType.USER);
@@ -135,7 +135,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
queryWrapper.ne("sys_role.state", DataStateEnum.DELETED.getCode());
queryWrapper.in("sys_role.type",role).orderByAsc("sys_role.type");
queryWrapper.in("sys_role.type", role).orderByAsc("sys_role.type");
List<Role> roleVOList = this.baseMapper.selectList(queryWrapper);
return roleVOList;
}
@@ -201,7 +201,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
@Override
public Role getRoleByCode(String code) {
return this.lambdaQuery().eq(Role::getCode,code).eq(Role::getState,1).one();
return this.lambdaQuery().eq(Role::getCode, code).eq(Role::getState, 1).one();
}
@Override
@@ -211,10 +211,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
return this.baseMapper.selectList(queryWrapper);
}
/**
* 角色类型 0:超级管理员；1:管理员；2:普通用户
*/
@Override
public List<Role> simpleList() {
LambdaQueryWrapper<Role> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(Role::getId,Role::getName).eq(Role::getState,DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper.select(Role::getId, Role::getName).eq(Role::getState, DataStateEnum.ENABLE.getCode()).eq(Role::getType, 2);
return this.baseMapper.selectList(lambdaQueryWrapper);
}