|
|
@@ -368,8 +368,10 @@ public class RoleServiceImpl implements IRoleService { |
|
|
|
@Override |
|
|
|
public JsonResult getRoles() { |
|
|
|
|
|
|
|
//超管 |
|
|
|
User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getUsername, "superAdmin").eq(User::getMark, 1)); |
|
|
|
List<Role> roles = roleMapper.selectList(Wrappers.<Role>lambdaQuery() |
|
|
|
.eq(Role::getMark, MarkEnum.VALID.getCode()).eq(Role::getStatus, 1).eq(Role::getTenantId, "1")); |
|
|
|
.eq(Role::getMark, MarkEnum.VALID.getCode()).eq(Role::getStatus, 1).eq(Role::getTenantId, user.getTenantId())); |
|
|
|
|
|
|
|
return JsonResult.success(roles); |
|
|
|
} |