Skip to content

Commit ad9e9cf

Browse files
committed
fix operator load
1 parent 09d0032 commit ad9e9cf

File tree

12 files changed

+23
-22
lines changed

12 files changed

+23
-22
lines changed

example/example-application/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-domain/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-infra-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-infra-jpa/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/example-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-example</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
<parent>
1414
<groupId>com.codingapi.springboot</groupId>
1515
<artifactId>springboot-parent</artifactId>
16-
<version>3.3.2.6.dev</version>
16+
<version>3.3.2.7.dev</version>
1717
</parent>
1818

1919
<artifactId>springboot-example</artifactId>
20-
<version>3.3.2.6.dev</version>
20+
<version>3.3.2.7.dev</version>
2121

2222
<name>springboot-example</name>
2323
<description>springboot-example project for Spring Boot</description>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.codingapi.springboot</groupId>
1414
<artifactId>springboot-parent</artifactId>
15-
<version>3.3.2.6.dev</version>
15+
<version>3.3.2.7.dev</version>
1616

1717
<url>https://github.com/codingapi/springboot-framewrok</url>
1818
<name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-flow/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.3.2.6.dev</version>
9+
<version>3.3.2.7.dev</version>
1010
</parent>
1111

1212
<name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/service/FlowService.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,14 @@ public FlowDetail detail(long recordId, IFlowOperator currentOperator) {
124124

125125

126126
BindDataSnapshot snapshot = flowBindDataRepository.getBindDataSnapshotById(flowRecord.getSnapshotId());
127-
List<FlowRecord> flowRecords = flowRecordRepository.findFlowRecordByProcessId(flowRecord.getProcessId()).
128-
stream().
129-
sorted((o1, o2) -> (int) (o1.getId() - o2.getId()))
130-
.toList();
127+
List<FlowRecord> flowRecords =
128+
flowRecordRepository.findFlowRecordByProcessId(flowRecord.getProcessId()).
129+
stream().
130+
sorted((o1, o2) -> (int) (o2.getId() - o1.getId()))
131+
.toList();
131132

132133
List<IFlowOperator> operators = new ArrayList<>();
133-
// 获取所有的操作者
134+
// 获取所有的操作者
134135
for (FlowRecord record : flowRecords) {
135136
operators.add(record.getCreateOperator());
136137
operators.add(record.getCurrentOperator());
@@ -199,7 +200,7 @@ public void transfer(long recordId, IFlowOperator currentOperator, IFlowOperator
199200
flowRecordRepository.update(flowRecord);
200201

201202
// 获取创建者
202-
IFlowOperator createOperator =flowRecord.getCreateOperator();
203+
IFlowOperator createOperator = flowRecord.getCreateOperator();
203204

204205
// 与当前流程同级的流程记录
205206
List<FlowRecord> historyRecords;
@@ -330,7 +331,7 @@ public FlowResult startFlow(String workCode, IFlowOperator operator, IBindData b
330331
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, operator, flowWork, snapshot.toBindData()));
331332
}
332333
// 当前的审批记录
333-
return new FlowResult(flowWork,records);
334+
return new FlowResult(flowWork, records);
334335
}
335336

336337
/**
@@ -400,7 +401,7 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
400401
boolean next = flowDirectionService.hasCurrentFlowNodeIsDone();
401402
if (next) {
402403
List<FlowRecord> todoRecords = historyRecords.stream().filter(FlowRecord::isTodo).toList();
403-
return new FlowResult(flowWork,todoRecords);
404+
return new FlowResult(flowWork, todoRecords);
404405
}
405406
}
406407

@@ -426,7 +427,7 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
426427
flowRecordRepository.finishFlowRecordByProcessId(flowRecord.getProcessId());
427428

428429
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_FINISH, flowRecord, currentOperator, flowWork, snapshot.toBindData()));
429-
return new FlowResult(flowWork,flowRecord);
430+
return new FlowResult(flowWork, flowRecord);
430431
}
431432

432433
// 获取流程的发起者
@@ -472,7 +473,7 @@ public FlowResult submitFlow(long recordId, IFlowOperator currentOperator, IBind
472473
EventPusher.push(new FlowApprovalEvent(FlowApprovalEvent.STATE_TODO, record, pushOperator, flowWork, snapshot.toBindData()));
473474
}
474475

475-
return new FlowResult(flowWork,records);
476+
return new FlowResult(flowWork, records);
476477
}
477478

478479

springboot-starter-security/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.3.2.6.dev</version>
9+
<version>3.3.2.7.dev</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>3.3.2.6.dev</version>
8+
<version>3.3.2.7.dev</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

0 commit comments

Comments
 (0)