diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java index 685e740b3..87dee44b4 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java @@ -100,7 +100,7 @@ public class RoleServiceImpl extends ServiceImpl implements IR @Override public List getCodeByList(List 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 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 implements IR @Override public List selectRoleDetail(Integer id) { List 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 implements IR } QueryWrapper 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 roleVOList = this.baseMapper.selectList(queryWrapper); return roleVOList; } @@ -201,7 +201,7 @@ public class RoleServiceImpl extends ServiceImpl 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 implements IR return this.baseMapper.selectList(queryWrapper); } + /** + * 角色类型 0:超级管理员;1:管理员;2:普通用户 + */ @Override public List simpleList() { LambdaQueryWrapper 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); }