Kaynağa Gözat

新增选择测试流程处理人逻辑

hubin 1 yıl önce
ebeveyn
işleme
1488c8eeed

+ 12 - 13
src/main/java/com/aizuda/boot/modules/flw/flow/FlowTaskActorProvider.java

@@ -76,19 +76,17 @@ public class FlowTaskActorProvider implements TaskActorProvider {
                 return getDepartmentHeadInfo(flowCreator, nodeModel.getExamineLevel(), false, () -> "请设置直接主管信息");
             } else if (NodeSetType.initiatorSelected.eq(nodeModel.getSetType())) {
                 // 4,发起人自选
-//                Map<String, Object> modelData = FlowDataTransfer.get(FlowConstants.processDynamicAssignee);
-//                if (ObjectUtils.isNotEmpty(modelData)) {
-//                    DynamicAssignee dynamicAssignee = (DynamicAssignee) modelData.get(nodeModel.getNodeKey());
-//                    if (null != dynamicAssignee) {
-//                        return dynamicAssignee.getAssigneeList().stream().map(t -> {
-//                            FlwTaskActor flwTaskActor = FlwTaskActor.ofNodeAssignee(t);
-//                            flwTaskActor.setActorType(dynamicAssignee.getType());
-//                            return flwTaskActor;
-//                        }).toList();
-//                    }
-//                }
-                // TODO 暂时默认返回发起人,后续换成前端传入的参数
-                return Collections.singletonList(FlowHelper.getFlwTaskActor());
+                Map<String, Object> modelData = FlowDataTransfer.get(FlowConstants.processDynamicAssignee);
+                if (ObjectUtils.isNotEmpty(modelData)) {
+                    DynamicAssignee dynamicAssignee = (DynamicAssignee) modelData.get(nodeModel.getNodeKey());
+                    if (null != dynamicAssignee && CollectionUtils.isNotEmpty(dynamicAssignee.getAssigneeList())) {
+                        return dynamicAssignee.getAssigneeList().stream().map(t -> {
+                            FlwTaskActor flwTaskActor = FlwTaskActor.ofNodeAssignee(t);
+                            flwTaskActor.setActorType(dynamicAssignee.getType());
+                            return flwTaskActor;
+                        }).toList();
+                    }
+                }
             } else if (NodeSetType.initiatorThemselves.eq(nodeModel.getSetType())) {
                 // 5,发起人自己
                 return Collections.singletonList(FlowHelper.getFlwTaskActor());
@@ -110,6 +108,7 @@ public class FlowTaskActorProvider implements TaskActorProvider {
                         .collect(Collectors.toList());
             }
         }
+        ApiAssert.fail( "请选择设置流程处理人信息");
         return null;
     }