From e5caabd7bd3385dd39cf455f8c664ae0bc6bd8eb Mon Sep 17 00:00:00 2001 From: guowl3 Date: Wed, 22 Jan 2025 14:24:00 +0800 Subject: [PATCH] check organization (#4194) --- .../com/oceanbase/odc/service/schedule/ScheduleService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java b/server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java index cab45c4c98..0d22ee6c65 100644 --- a/server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java +++ b/server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/ScheduleService.java @@ -95,6 +95,7 @@ import com.oceanbase.odc.service.iam.ProjectPermissionValidator; import com.oceanbase.odc.service.iam.UserService; import com.oceanbase.odc.service.iam.auth.AuthenticationFacade; +import com.oceanbase.odc.service.iam.model.Organization; import com.oceanbase.odc.service.iam.model.User; import com.oceanbase.odc.service.objectstorage.ObjectStorageFacade; import com.oceanbase.odc.service.quartz.QuartzJobService; @@ -394,8 +395,9 @@ private ScheduleChangeLog createScheduleChangelog(ScheduleChangeParams req, Sche log.info("Create change log success,changLog={}", changeLog); req.setScheduleChangeLogId(changeLog.getId()); Long approvalFlowInstanceId; - if (organizationService.get(targetSchedule.getId()).isPresent() - && organizationService.get(targetSchedule.getId()).get().getType() == OrganizationType.INDIVIDUAL) { + Optional organization = organizationService.get(targetSchedule.getOrganizationId()); + if (organization.isPresent() + && organization.get().getType() == OrganizationType.INDIVIDUAL) { approvalFlowInstanceId = null; } else { approvalFlowInstanceId = approvalFlowService.create(req);