From 5a2b41a601331de078460e402cd1300ba96fdecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?= <lijing@x-ri.com>
Date: Tue, 11 Jun 2024 17:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=BE=85=E5=8A=9E=E9=9B=86?=
 =?UTF-8?q?=E6=88=900.6=20=E6=B3=9B=E5=BE=AEsyscode=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cxkg/integration/MessageListen.java       | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java
index 55ddf7d..5d947fa 100644
--- a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java
+++ b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/integration/MessageListen.java
@@ -205,7 +205,6 @@ public class MessageListen extends AbstractMessageServiceHandler {
         String MessageState = "";
         String billno = "";
 //        String title = isdel ? "流程撤回" : toDoInfo.getContent();
-//        String entityName = messageContext.getEntityName();
 //        if (title != null) {
 //            int dex = title.indexOf("单", 0);
 //            if (dex != -1) {
@@ -320,31 +319,28 @@ public class MessageListen extends AbstractMessageServiceHandler {
 ////            startUserMobile = receiver.getString("phone");
 //            receiverUser = receiver.getString("username");
 //        }
-        String entityNumber = messageContext.getEntityNumber();
+        String entityName = messageContext.getEntityName();
         userNames.add(startUserName);
         List<Map<String, Object>> requestBodyList = new ArrayList();
         Iterator var47 = userNames.iterator();
-        // String syscode = System.getProperty("cxkg.integration.MessageListen.oakey");
-        // JSONObject jsonCode = JSON.parseObject(syscode);
-        // syscode
-        String syscodestr = System.getProperty("cxkg.integration.MessageListen.syscode");
-        JSONObject jsonCode2 = JSON.parseObject(syscodestr);
-        String syscode2 = jsonCode2.getString(entityNumber);
-        if(syscode2 == null || "".equals(syscode2)){
-            log.info("cxkg.integration.MessageListen.syscode is null: " +
-                    messageContext.getEntityName() + "/" + entityNumber);
+        String syscodestr = System.getProperty("cxkg.integration.MessageListen.oakey");
+        JSONObject jsonCode = JSON.parseObject(syscodestr);
+        String syscode = jsonCode.getString(entityName);
+        if(syscode == null || "".equals(syscode)){
+            if(entityName.startsWith("差旅报销单")){
+                syscode = jsonCode.getString("差旅报销单");
+            } else {
+                log.info("cxkg.integration.MessageListen.syscode is null: " +
+                        entityName + "/" + messageContext.getEntityNumber());
+            }
         }
-        // entityName
-        String workflownamestr = System.getProperty("cxkg.integration.MessageListen.workflowname");
-        JSONObject jsonCode3 = JSON.parseObject(workflownamestr);
-        String entityName = jsonCode3.getString(entityNumber);
         String title = "请处理" + startUserTrueName + "提交的" + entityName + "：" + messageContext.getBillNo();
 
         while (var47.hasNext()) {
             String userName = (String) var47.next();
             if (userName.equals(startUserName)) {
                 Map<String, Object> requestBody = new HashMap();
-                requestBody.put("syscode", syscode2);
+                requestBody.put("syscode", syscode);
                 requestBody.put("flowid", String.valueOf(processInstanceId));
                 requestBody.put("requestname", title);
                 requestBody.put("workflowname", entityName); // + "审批流程"
@@ -362,10 +358,10 @@ public class MessageListen extends AbstractMessageServiceHandler {
                 requestBody.put("bizState", String.valueOf(tasktype));
                 requestBody.put("lastNameList", userName);
 //                requestBody.put("targetId", "588|"+String.valueOf(processInstanceId));
-//                requestBodyList.add(requestBody);
+                requestBodyList.add(requestBody);
             } else {
                 Map<String, Object> requestBody = new HashMap();
-                requestBody.put("syscode", syscode2);
+                requestBody.put("syscode", syscode);
                 requestBody.put("flowid", String.valueOf(processInstanceId));
                 if (title != null) {
                     requestBody.put("requestname", title);