diff --git a/src/main/java/org/springblade/modules/system/controller/RoleController.java b/src/main/java/org/springblade/modules/system/controller/RoleController.java index 6de8de1..d73e8eb 100644 --- a/src/main/java/org/springblade/modules/system/controller/RoleController.java +++ b/src/main/java/org/springblade/modules/system/controller/RoleController.java @@ -96,13 +96,15 @@ public class RoleController extends BladeController { @GetMapping("/list") @Parameters({ @Parameter(name = "roleName", description = "参数名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")), - @Parameter(name = "roleAlias", description = "角色别名", in = ParameterIn.QUERY, schema = @Schema(type = "string")) - }) + @Parameter(name = "roleAlias", description = "角色别名", in = ParameterIn.QUERY, schema = @Schema(type = "string"))}) @ApiOperationSupport(order = 2) @Operation(summary = "列表", description = "传入role") public R> list(@Parameter(hidden = true) @RequestParam Map role, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(role, Role.class); - List list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper); + List list = roleService.list( + (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? + queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper + ); return R.data(RoleWrapper.build().listNodeVO(list)); }