From e483643a8800fb1e98160b1d4b3b46c95ce37611 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Thu, 16 Nov 2023 15:54:21 +0800 Subject: [PATCH] =?UTF-8?q?#EC=5FHJ139#=20=E6=B5=81=E7=A8=8B=E8=A2=AB?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E4=BA=BA=E5=A4=84=E7=90=86=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sendtodo/agent/SendPortalToReadByAgentUtil.java | 13 +++++++------ .../sendtodo/agent/SendPortalTodoByAgentUtil.java | 9 +++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/com/customization/dito/sendtodo/agent/SendPortalToReadByAgentUtil.java b/src/com/customization/dito/sendtodo/agent/SendPortalToReadByAgentUtil.java index 05698452..eae09826 100644 --- a/src/com/customization/dito/sendtodo/agent/SendPortalToReadByAgentUtil.java +++ b/src/com/customization/dito/sendtodo/agent/SendPortalToReadByAgentUtil.java @@ -46,6 +46,8 @@ public class SendPortalToReadByAgentUtil { String objectAction = "0" ; String objectType = "0"; + String currentUserId = user.getUID()+"" ; + try { String processTime = DateUtil.getCurrentTime("yyyy-MM-dd HH:mm:ss"); JSONArray taskObjectList = new JSONArray(); @@ -173,12 +175,11 @@ public class SendPortalToReadByAgentUtil { String resultCode = msgObject.getString("resultCode"); if("0".equals(resultCode)){ - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,"",zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeid,nodename,currentUserId,requestObject.toJSONString(),resultCode,"",zhjkbs,userid); }else{ String resultmsg = msgObject.getString("resultMsg"); - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeid,nodename,userid,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs); - + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,nodeid,nodename,currentUserId,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs,userid); } } } @@ -206,7 +207,7 @@ public class SendPortalToReadByAgentUtil { String cus_staff = PropBean.getUfPropValue("cus_staff") ; String scopeid = "-1"; String scope = "HrmCustomFieldByInfoType" ; - + String currentUserId = user.getUID()+"" ; JSONObject requestObject = new JSONObject(); String actionType = "2"; @@ -359,7 +360,7 @@ public class SendPortalToReadByAgentUtil { String resultCode = msgObject.getString("resultCode"); if ("0".equals(resultCode)) { - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,f_weaver_belongto_userid,requestObject.toJSONString(),resultCode,"",zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,currentUserId,requestObject.toJSONString(),resultCode,"",zhjkbs,userid); }else if ("TODO-FAIL-002".equals(resultCode)){ //The task does not exist.任务不存在，则新增 @@ -367,7 +368,7 @@ public class SendPortalToReadByAgentUtil { } else{ String resultmsg = msgObject.getString("resultMsg"); - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,f_weaver_belongto_userid,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,currentUserId,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs,userid); } } diff --git a/src/com/customization/dito/sendtodo/agent/SendPortalTodoByAgentUtil.java b/src/com/customization/dito/sendtodo/agent/SendPortalTodoByAgentUtil.java index 8984142e..72c77703 100644 --- a/src/com/customization/dito/sendtodo/agent/SendPortalTodoByAgentUtil.java +++ b/src/com/customization/dito/sendtodo/agent/SendPortalTodoByAgentUtil.java @@ -55,6 +55,8 @@ public class SendPortalTodoByAgentUtil { String emailArray = ""; Pattern regex = Pattern.compile(EMAIL_REGEX_DEFAULT); try { + + String nextNodeUserIds = "" ; String createrLastName = ""; String currentNodeId = "" ; String currentNodeName = "" ; @@ -180,6 +182,7 @@ public class SendPortalTodoByAgentUtil { } } }else{ + String actionType = "2" ; String objectAction = "0" ; String objectType = "0"; @@ -252,7 +255,9 @@ public class SendPortalTodoByAgentUtil { String usercode = Util.null2String(rs.getString("loginid")) ; String staffid = Util.null2String(rs.getString("staffid")) ; + String userid = Util.null2String(rs.getString("userid")) ; + nextNodeUserIds += StringUtils.isEmpty(nextNodeUserIds) ? userid : ","+userid ; if("sysadmin".equals(usercode)){ usercode = "Admin"; @@ -301,11 +306,11 @@ public class SendPortalTodoByAgentUtil { sendMailUtil.sendMail(requestid,emailArray,notificationSubject,notificationContent); } - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,f_weaver_belongto_userid,requestObject.toJSONString(),resultCode,"",zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,currentUserId,requestObject.toJSONString(),resultCode,"",zhjkbs,nextNodeUserIds); }else{ String resultmsg = msgObject.getString("resultMsg"); - sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,f_weaver_belongto_userid,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs); + sendPortalErrorUtil.doRecordPortalErrorInfo4Phase2(requestid,currentNodeId,currentNodeName,currentUserId,requestObject.toJSONString(),resultCode,resultmsg,zhjkbs,nextNodeUserIds); } } }