#xinfengYin-12# HTZN103-用印申请流程

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"));

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<String> set = new HashSet<String>();
                 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];