From 17e3361d6258eb36f6a7311b00b6836f4c451977 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 30 Nov 2023 17:19:06 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=A8=A1=E6=8B=9F=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E8=A1=A5=E5=8D=A1=E7=9A=84=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B,=20=E5=90=8C=E6=97=B6=E8=B0=83=E6=95=B4JSON?=
 =?UTF-8?q?=20=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BpmnProcessDefinitionServiceImpl.java     |  3 ++-
 .../src/main/resources/kaoqing.json           | 20 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

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"