From 3ed9a9b530b0eda5b22e5e166635ccbeb6738384 Mon Sep 17 00:00:00 2001
From: shilei <798989044@qq.com>
Date: Fri, 17 Nov 2023 17:53:43 +0800
Subject: [PATCH] =?UTF-8?q?#EC=5FHJ143#=20=E6=B5=81=E7=A8=8B=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=8A=84=E9=80=81=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SendPortalOverTimeSubmitUtil.java         | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java b/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java
index 9fd13e25..9e53af85 100644
--- a/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java
+++ b/src/weaver/interfaces/dito/overtime/SendPortalOverTimeSubmitUtil.java
@@ -210,7 +210,7 @@ public class SendPortalOverTimeSubmitUtil {
         SendPortalErrorUtil sendPortalErrorUtil = new SendPortalErrorUtil();
         HttpRequestUtil httpRequestUtil = new HttpRequestUtil();
         String mobileJumpUrl = PropBean.getUfPropValue("mobileJumpUrl");
-        JSONObject requestObject = new JSONObject();
+
         bb.writeLog("SendPortalOverTimeSubmitUtil--sendOverTimeSubmitBytoRead");
         String terminal = "1" ;
         String actionType = "0" ;
@@ -255,22 +255,7 @@ public class SendPortalOverTimeSubmitUtil {
                 nodeId = Util.null2String(rs.getString("nodeid")) ;
                 nodeName = Util.null2String(rs.getString("nodeName")) ;
             }
-            requestObject.put("center",center);
-            requestObject.put("title",requestname);
-            requestObject.put("taskCode", requestid+"_cs_"+userids);
-
-            requestObject.put("nodeId",nodeId);
-            requestObject.put("taskType",taskType);
-            requestObject.put("actionType",actionType);
-            requestObject.put("createDate",processTime);
-            requestObject.put("messageTitle",getShortMessageTitle(requestname));
-            requestObject.put("messageContent",requestname);
-            requestObject.put("terminal",terminal);
-            requestObject.put("urlPc",urlPc);
-            requestObject.put("urlApp",urlApp);
-            requestObject.put("urlDing",urlDing);
-            requestObject.put("nodeName",nodeName);
-            requestObject.put("ticketType",workflowname);
+
 
             JSONArray taskObjectList = new JSONArray();
             sql =   "  select t2.userid,h1.loginid,h1.email,t2.isremark,t1.requestid,t2.nodeid,d1.nodename,c1."+cus_staff+" as staffid "+
@@ -320,6 +305,24 @@ public class SendPortalOverTimeSubmitUtil {
                 JSONArray taskArray = new JSONArray();
                 taskArray.add(taskObject);
 
+                JSONObject requestObject = new JSONObject();
+                requestObject.put("center",center);
+                requestObject.put("title",requestname);
+                requestObject.put("taskCode", requestid+"_cs_"+userid);
+
+                requestObject.put("nodeId",nodeId);
+                requestObject.put("taskType",taskType);
+                requestObject.put("actionType",actionType);
+                requestObject.put("createDate",processTime);
+                requestObject.put("messageTitle",getShortMessageTitle(requestname));
+                requestObject.put("messageContent",requestname);
+                requestObject.put("terminal",terminal);
+                requestObject.put("urlPc",urlPc);
+                requestObject.put("urlApp",urlApp);
+                requestObject.put("urlDing",urlDing);
+                requestObject.put("nodeName",nodeName);
+                requestObject.put("ticketType",workflowname);
+
                 requestObject.put("taskObjectList",taskArray);
                 String auth = username + ":" + passwd;
                 bb.writeLog("sendOverTimeSubmitBytoRead---requestObject:"+requestObject.toJSONString());