Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java

@@ -60,11 +60,11 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl
                 }
                 logger_78218549.error("xxjllx -----"+ xxjllx);
                 DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
-                DetailTable dtq = detailtable[0];
-                Row[] sq = dtq.getRow();
-                logger_78218549.error("sq -----"+ sq.toString());
                 StringBuilder sb = new StringBuilder();
                 String state = "";
+                if(detailtable.length >0){
+                    DetailTable dtq = detailtable[0];
+                    Row[] sq = dtq.getRow();
                     if (sq.length > 0) {
                         logger_78218549.error("sqlength");
                         String[][] str = new String[sq.length][21];
@@ -107,8 +107,11 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl
                         logger_78218549.error(String.valueOf("ZSRM_PUR_INFO_Action-return-" + requestid + "-[" + ret[0] + "," + ret[1] + "]"));
                         sb.append("信息记录新增结果：" + ret[1]);
                     }
+                }
+
                 if ("4".equals(xxjllx)) {
                     DetailTable[] dt = requestinfo.getDetailTableInfo().getDetailTable();
+                    if(dt.length > 1){
                         DetailTable dtm = dt[1];
                         Row[] rows = dtm.getRow();
                         String[][] param = new String[rows.length][9];
@@ -143,6 +146,7 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl
                             state = res[0];
                         }
                     }
+                }
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
                 BillFieldUtil util = new BillFieldUtil();
 //                String tablename = util.getTablename(wfid);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java

@@ -60,10 +60,9 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                 }
                 logger_9ad0d62b.error("xxjllx -----"+ xxjllx);
                 DetailTable[] detailtable1 = requestinfo.getDetailTableInfo().getDetailTable();
-                logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  detailtable1---->"+ JSONObject.toJSONString(detailtable1));
+                if(detailtable1.length >1){
                     DetailTable dtq1 = detailtable1[1];
                     Row[] sq1 = dtq1.getRow();
-
                     logger_9ad0d62b.error("sq1 -----"+ sq1.toString());
                     if ("4".equals(xxjllx)) {
                         logger_9ad0d62b.error("sq1.length -----"+ sq1.length);
@@ -97,8 +96,10 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                             return  WeaResult.fail(500, "信息记录类型不是黄金实际价时，不需要填写黄金实际价信息明细！", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager()));
                         }
                     }
+                }
+
                 DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
-                logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  detailtable---->"+ JSONObject.toJSONString(detailtable));
+                if(detailtable.length >0){
                     DetailTable dtq = detailtable[0];
                     logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  dtq---->"+ JSONObject.toJSONString(dtq));
                     Row[] sq = dtq.getRow();
@@ -147,6 +148,7 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
 
                         }
                     }
+                }
             } catch (Exception e) {
 
                 logger_9ad0d62b.error(String.valueOf("ZSRM_PUR_INFO_CheckAction-error-" + requestid + "-[" + e.toString() + "]"));