diff --git a/app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/publish/TaskPublisher.java b/app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/publish/TaskPublisher.java index c730970a3..314654a8c 100644 --- a/app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/publish/TaskPublisher.java +++ b/app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/appversion/publish/TaskPublisher.java @@ -62,6 +62,7 @@ public void publish(PublishContext context, AppVersion appVersion) { .setAippType(NORMAL.name()) .setFlowConfigId(flowInfo.getFlowId()) .setFlowDefinitionId(flowInfo.getFlowDefinitionId()) + .setAppSuiteId(appVersion.getData().getAppSuiteId()) .build(); log.debug("create aipp, task info {}", createArgs.getEntity().toString()); this.appTaskService.createTask(createArgs, context.getOperationContext()); diff --git a/app-builder/jane/task-new/src/main/java/modelengine/fit/task_new/repository/impl/MetaRepositoryImpl.java b/app-builder/jane/task-new/src/main/java/modelengine/fit/task_new/repository/impl/MetaRepositoryImpl.java index 734763ea0..dadb2d2ef 100644 --- a/app-builder/jane/task-new/src/main/java/modelengine/fit/task_new/repository/impl/MetaRepositoryImpl.java +++ b/app-builder/jane/task-new/src/main/java/modelengine/fit/task_new/repository/impl/MetaRepositoryImpl.java @@ -19,6 +19,7 @@ import modelengine.fit.task_new.repository.MetaRepository; import modelengine.fit.task_new.util.UUIDUtil; import modelengine.fitframework.annotation.Component; +import modelengine.fitframework.util.StringUtils; import java.time.LocalDateTime; import java.util.List; @@ -43,7 +44,7 @@ public MetaRepositoryImpl(MetaMapper metaMapper) { @Override public Meta insertOne(MetaDeclarationInfo metaDeclarationInfo, OperationContext context) { MetaPo metaPO = MetaPo.convertToMetaPO(metaDeclarationInfo, context); - String templateId = this.retrieveByName(metaPO.getName()).map(Meta::getId).orElse(UUIDUtil.uuid()); + String templateId = StringUtils.isNotEmpty(metaPO.getTemplateId()) ? metaPO.getTemplateId() : UUIDUtil.uuid(); metaPO.setTemplateId(templateId); metaPO.setId(UUIDUtil.uuid()); metaPO.setCreatedBy(context.getOperator());