日志PDF回显

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -1720,10 +1720,10 @@ public class ExcelTabController extends BladeController {
                                 if (val.indexOf("__") >= 0) {
                                     String[] DataVal = val.split("__");
                                     String[] xy = DataVal[1].split("_");
-                                    if (trs.size() > (Integer.parseInt(xy[0])-1)) {
+                                    if (trs.size() > Integer.parseInt(xy[0])) {
                                         Element trData = trs.get(Integer.parseInt(xy[0]));
                                         Elements tdDatas = trData.select("td");
-                                        if (tdDatas.size() > (Integer.parseInt(xy[0]) - 1)) {
+                                        if (tdDatas.size() > Integer.parseInt(xy[1])) {
                                             Element data = tdDatas.get(Integer.parseInt(xy[1]));
 
                                             if (data.html().indexOf("x1") >= 0 && data.html().indexOf("y1") >= 0) {
@@ -1800,7 +1800,7 @@ public class ExcelTabController extends BladeController {
                                 if ( trs.size() > (Integer.parseInt(trtd[0]))) {
                                     Element trData = trs.get(Integer.parseInt(trtd[0]));
                                     Elements tdDatas = trData.select("td");
-                                    if (tdDatas.size() > (Integer.parseInt(trtd[0]) - 1)) {
+                                    if (tdDatas.size() > Integer.parseInt(trtd[1])) {
                                         Element data = tdDatas.get(Integer.parseInt(trtd[1]));
 //                                Element data = trs.get(Integer.parseInt(trtd[0])).select("td").get(Integer.parseInt(trtd[1]));
 
@@ -2407,9 +2407,11 @@ public class ExcelTabController extends BladeController {
         } else { // 单个保存
             dataArray.add(dataInfo);
         }
+        JSONObject tableInfo1 = dataArray.getJSONObject(0);
+        String nodeid = tableInfo1.getString("nodeId");
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);
         try {
-            this.excelTabService.formulaFillData(tableInfoList, null);
+            this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeid));
         } catch (Exception e) {
             e.printStackTrace();
         }