Skip to content

Commit c0ca364

Browse files
committed
fix reactive errors (null exception)
1 parent c41c905 commit c0ca364

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,9 @@ public Mono<ApplicationQuery> getQueryByViewModeAndQueryId(boolean isViewMode, S
137137
@Transient
138138
@JsonIgnore
139139
public Mono<Map<String, Object>> getLiveApplicationDsl(ApplicationRecordService applicationRecordService) {
140-
return applicationRecordService.getLatestRecordByApplicationId(this.getId()).map(applicationRecord -> {
141-
Map<String, Object> dsl = applicationRecord == null ? editingApplicationDSL : applicationRecord.getApplicationDSL();
142-
if(dsl == null) dsl = new HashMap<>();
143-
return dsl;
144-
});
140+
return applicationRecordService.getLatestRecordByApplicationId(this.getId())
141+
.map(ApplicationRecord::getApplicationDSL)
142+
.switchIfEmpty(Mono.just(editingApplicationDSL));
145143
}
146144

147145
public String getOrganizationId() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public Mono<List<Application>> getAllDependentModulesFromApplicationId(String ap
141141

142142
@Override
143143
public Mono<List<Application>> getAllDependentModulesFromApplication(Application application, boolean viewMode) {
144-
return application.getLiveApplicationDsl(applicationRecordService).flatMap(liveApplicationDsl -> {
144+
return application.getLiveApplicationDsl(applicationRecordService).switchIfEmpty(Mono.just(new HashMap<>())).flatMap(liveApplicationDsl -> {
145145
Map<String, Object> dsl = viewMode ? liveApplicationDsl : application.getEditingApplicationDSL();
146146
return getAllDependentModulesFromDsl(dsl);
147147
});

0 commit comments

Comments
 (0)