|
|
@@ -283,14 +283,12 @@ public class ManualProcessor extends AbstractManualProcessor {
|
|
|
protected List<Work> executing(AeiObjects aeiObjects, Manual manual) throws Exception {
|
|
|
List<Work> results = new ArrayList<>();
|
|
|
boolean passThrough = false;
|
|
|
- List<String> identities = aeiObjects.business().organization().identity()
|
|
|
- .list(aeiObjects.getWork().getManualTaskIdentityList());
|
|
|
// 找到在当前环节已经处理过的已办
|
|
|
List<TaskCompleted> taskCompleteds = aeiObjects.getJoinInquireTaskCompleteds().stream()
|
|
|
.filter(o -> StringUtils.equals(aeiObjects.getWork().getActivityToken(), o.getActivityToken()))
|
|
|
.collect(Collectors.toList());
|
|
|
// 去掉已经处理过的身份
|
|
|
- identities = ListUtils.subtract(identities,
|
|
|
+ List<String> identities = ListUtils.subtract(aeiObjects.getWork().getManualTaskIdentityList(),
|
|
|
ListTools.extractProperty(taskCompleteds, TaskCompleted.identity_FIELDNAME, String.class, true, true));
|
|
|
identities = aeiObjects.business().organization().identity().list(identities);
|
|
|
// 现在处理人为空且没有参与流转的已办
|