Skip to content

Commit 7e4c668

Browse files
authored
flow:bug (#505)
* flow:fix bug * flow:fix bug * flow: fix bug
1 parent df841b5 commit 7e4c668

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

middleware/flow/src/flow_initializer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub async fn init_db(mut funs: TardisFunsInst) -> TardisResult<()> {
7979
if check_initialized(&funs, &ctx).await? {
8080
init_basic_info(&funs).await?;
8181
self::modify_post_actions(&funs, &ctx).await?;
82-
self::check_data(&funs, &ctx).await?;
82+
// self::check_data(&funs, &ctx).await?;
8383
} else {
8484
let db_kind = TardisFuns::reldb().backend();
8585
let compatible_type = TardisFuns::reldb().compatible_type();

middleware/flow/src/serv/flow_inst_serv.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ impl FlowInstServ {
418418

419419
pub finish_ctx: Option<Value>,
420420
pub finish_time: Option<DateTime<Utc>>,
421-
pub finish_abort: bool,
421+
pub finish_abort: Option<bool>,
422422
pub output_message: Option<String>,
423423

424424
pub own_paths: String,
@@ -429,6 +429,7 @@ impl FlowInstServ {
429429
.columns([
430430
(flow_inst::Entity, flow_inst::Column::Id),
431431
(flow_inst::Entity, flow_inst::Column::RelFlowModelId),
432+
(flow_inst::Entity, flow_inst::Column::RelBusinessObjId),
432433
(flow_inst::Entity, flow_inst::Column::CurrentStateId),
433434
(flow_inst::Entity, flow_inst::Column::CreateCtx),
434435
(flow_inst::Entity, flow_inst::Column::CreateTime),
@@ -482,7 +483,7 @@ impl FlowInstServ {
482483
create_time: inst.create_time,
483484
finish_ctx: inst.finish_ctx.map(|finish_ctx| TardisFuns::json.json_to_obj(finish_ctx).unwrap()),
484485
finish_time: inst.finish_time,
485-
finish_abort: inst.finish_abort,
486+
finish_abort: inst.finish_abort.is_some(),
486487
output_message: inst.output_message,
487488
own_paths: inst.own_paths,
488489
current_state_id: inst.current_state_id,

0 commit comments

Comments
 (0)