From 6c53bc599417b8fbd6d89a3e5e20dc9c9af0405c Mon Sep 17 00:00:00 2001 From: xinfengYin <1776570748@qq.com> Date: Wed, 26 Feb 2025 10:46:09 +0800 Subject: [PATCH] =?UTF-8?q?#xinfengYin-12#=20HTZN103-=E7=94=A8=E5=8D=B0?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/workflow/action/LastOperateAction.java | 6 ++++-- .../interfaces/workflow/action/OaSrmVenMatExtAction.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java index 354657f..1a15233 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java @@ -52,6 +52,7 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1))); Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1))); RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp); + logger_e95a7685.error("workflow_action_LastOperateAction start"); try { try { RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class); @@ -61,11 +62,13 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless // 流程请求ID String reid = request.getRequestid(); String workflowid = request.getWorkflowid(); + // 获取审批人姓名 String spr = hr.getResourcename(request.getLastoperator()); + logger_e95a7685.error("workflow_action_LastOperateAction spr==>",spr); // String tablename = wkbl.getTablename(wkfl.getFormId(workflowid)); String tablename = request.getRequestManager().getBillTableName(); - + logger_e95a7685.error("workflow_action_LastOperateAction tablename==>",tablename); String logsql = "update e10_core_business.dbo." + tablename + " set spr = '" + spr + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -76,7 +79,6 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless logger_e95a7685.error(String.valueOf("LastOperateAction:" + logsql)); logger_e95a7685.error(String.valueOf("------------------------------------------------------------------------")); logger_e95a7685.error(String.valueOf("end log")); - } catch (Exception e) { // BaseBean baseBean = new BaseBean(); logger_e95a7685.error(String.valueOf("start log")); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java index 52c9ec5..a14b53d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVenMatExtAction.java @@ -144,7 +144,7 @@ public class OaSrmVenMatExtAction extends BaseBean implements Action, EsbServerl VenMatExtResultIn paramInfo = new VenMatExtResultIn(); Set set = new HashSet(); VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[sq.length]; - if ("6".equals(cllx) || "7".equals(cllx)) { + if (sq != null && ( "6".equals(cllx) || "7".equals(cllx))) { for (int j = 0; j < sq.length; j++) { // 指定行 Row rq = sq[j];