diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessDefinitionServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessDefinitionServiceImpl.java index 805b0c30e..4d3ec34e4 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessDefinitionServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessDefinitionServiceImpl.java @@ -211,7 +211,8 @@ public class BpmnProcessDefinitionServiceImpl implements BpmnProcessDefinitionSe } else if (filterDefinitions.size() == 1) { processDefinition = filterDefinitions.get(0); } else { - processDefinition = filterDefinitions.stream().filter(i -> Objects.equals(tenantId, i.getKey())).findFirst() + processDefinition = + filterDefinitions.stream().filter(i -> Objects.equals(tenantId, i.getTenantId())).findFirst() .orElseThrow(() -> new WorkflowEngineException(PROCESS_DEFINITION_ID_NOT_EXISTS)); } diff --git a/workflow-engine-server/src/main/resources/kaoqing.json b/workflow-engine-server/src/main/resources/kaoqing.json index 68571574c..ce317b608 100644 --- a/workflow-engine-server/src/main/resources/kaoqing.json +++ b/workflow-engine-server/src/main/resources/kaoqing.json @@ -4,8 +4,8 @@ "category": "1", "jsonModel": { "noticeConf": { - "pendingMessageId": "41", - "noticeMessageId": "64", + "pendingMessageId": "6b2fd313a7e04fcb8d92ca6fa4c675e9", + "noticeMessageId": "590", "smsId": "40" }, "buttonConf": { @@ -332,9 +332,9 @@ "property": { "approvalMethod": "human", "approverScope": "projectWorkspace", - "approverSpecify": "identity", + "approverSpecify": "fixedPerson", "specifyValue": [ - "{\"assignee\":\"\",\"assigneeType\":\"\"}" + "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}" ], "multiMode": "AND", "approverEmptyHandleType": "autoPassed" @@ -354,9 +354,9 @@ "property": { "approvalMethod": "human", "approverScope": "projectWorkspace", - "approverSpecify": "position", + "approverSpecify": "fixedPerson", "specifyValue": [ - "{\"assignee\":\"\",\"assigneeType\":\"\"}" + "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}" ], "multiMode": "AND", "approverEmptyHandleType": "autoPassed" @@ -424,9 +424,9 @@ "property": { "approvalMethod": "human", "approverScope": "projectWorkspace", - "approverSpecify": "position", + "approverSpecify": "fixedPerson", "specifyValue": [ - "{\"assignee\":\"\",\"assigneeType\":\"\"}" + "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}" ], "multiMode": "AND", "approverEmptyHandleType": "autoPassed" @@ -446,9 +446,9 @@ "property": { "approvalMethod": "human", "approverScope": "projectWorkspace", - "approverSpecify": "identity", + "approverSpecify": "fixedPerson", "specifyValue": [ - "{\"assignee\":\"\",\"assigneeType\":\"\"}" + "{\"assignerName\":\"黎炳印\",\"ouId\":\"5140\",\"tenantId\":\"195\",\"personId\":\"80554\",\"assignee\":\"33163\",\"assigneeType\":\"3\"}" ], "multiMode": "AND", "approverEmptyHandleType": "autoPassed"