Skip to content

Commit c2fa8e1

Browse files
committed
fix: temporary block fix for getting org id
1 parent 5034493 commit c2fa8e1

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@
5050
import reactor.core.publisher.Flux;
5151
import reactor.core.publisher.Mono;
5252

53+
import java.time.Duration;
5354
import java.time.Instant;
5455
import java.util.HashSet;
5556
import java.util.List;
5657
import java.util.Map;
5758
import java.util.Set;
59+
import java.util.concurrent.TimeUnit;
5860
import java.util.stream.Collectors;
5961

6062
import static org.lowcoder.domain.application.model.ApplicationStatus.NORMAL;
@@ -475,10 +477,15 @@ public Mono<ResourcePermission> checkApplicationPermissionWithReadableErrorMsg(S
475477
.flatMap(permissionStatus -> {
476478
if (!permissionStatus.hasPermission()) {
477479

478-
String orgId = applicationService.findById(applicationId)
479-
.map(Application::getOrganizationId)
480-
.onErrorReturn("")
481-
.block();
480+
String orgId = "";
481+
try {
482+
orgId = applicationService.findById(applicationId)
483+
.map(Application::getOrganizationId)
484+
.onErrorReturn("")
485+
.block(Duration.ofSeconds(2));
486+
} catch(Throwable cause) {
487+
log.warn("Couldn't get orgId! - {}", cause.getMessage());
488+
}
482489

483490
HttpHeaders headers = new HttpHeaders();
484491
if (StringUtils.isNotBlank(orgId)) {

0 commit comments

Comments
 (0)