|
@@ -32,7 +32,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
-import org.apache.commons.collections.MapUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -168,12 +167,14 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
|
|
|
List<NodeModel> unsetAssigneeNodes = ModelHelper.getUnsetAssigneeNodes(flwProcess.model().getNodeConfig());
|
|
|
if (CollectionUtils.isNotEmpty(unsetAssigneeNodes)) {
|
|
|
Map<String, DynamicAssignee> assigneeMap = dto.getAssigneeMap();
|
|
|
- ApiAssert.fail(MapUtils.isEmpty(assigneeMap), "发起人自选节点未设置处理人员");
|
|
|
unsetAssigneeNodes.forEach(t -> {
|
|
|
if (NodeSetType.supervisor.eq(t.getSetType()) || NodeSetType.multiLevelSupervisors.eq(t.getSetType())) {
|
|
|
// 主管由 FlowTaskActorProvider 类提供,不认为非法逻辑
|
|
|
return;
|
|
|
}
|
|
|
+ if (NodeSetType.specifyMembers.eq(t.getSetType()) || NodeSetType.initiatorSelected.eq(t.getSetType())) {
|
|
|
+ ApiAssert.fail(null == assigneeMap.get(t.getNodeKey()), "发起人自选节点未设置处理人员");
|
|
|
+ }
|
|
|
DynamicAssignee dynamicAssignee = assigneeMap.get(t.getNodeKey());
|
|
|
ApiAssert.fail(null == dynamicAssignee || CollectionUtils.isEmpty(dynamicAssignee.getAssigneeList()),
|
|
|
"节点【 " + t.getNodeName() + " 】未设置处理人员");
|