wenhongquan 2 năm trước cách đây
mục cha
commit
39d6ba3143

+ 34 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BigScreenController.java

@@ -351,23 +351,44 @@ public class BigScreenController extends BaseController
                             }
                         }
                     }
-                    deptn = deptn.substring(0,deptn.length()-1);
+                    deptn = deptn.length()>1?deptn.substring(0,deptn.length()-1):"-";
+                }
+
+
+                Object xchs =null;
+
+                 try{
+                     if(task.getStatus()>=3L){
+                         String runjs = commjs+"return JSON.parse(\n" +
+                                 "                          taskinfo.tblTaskLogList.filter(\n" +
+                                 "                            function(ii) { return ii.taskStatus === 3}\n" +
+                                 "                          )[0].logDes\n" +
+                                 "                        ).gzldata[0].value1 }";
+                         xchs = JSUtils.runjs(runjs);
+                     }
+
+
+                 }catch (Exception e){
+
+                 }
+
+                Object czff = null;
+                try{
+                    if(task.getStatus()>=3L) {
+                        String runjs = commjs + "return JSON.parse(\n" +
+                                "                          taskinfo.tblTaskLogList.filter(\n" +
+                                "                            function(ii) { return ii.taskStatus === 3}\n" +
+                                "                          )[0].logDes\n" +
+                                "                        ).czff }";
+                        czff = JSUtils.runjs(runjs);
+                    }
+
+                }catch (Exception e){
+
                 }
 
 
-                String runjs = commjs+"return JSON.parse(\n" +
-                        "                          taskinfo.tblTaskLogList.filter(\n" +
-                        "                            function(ii) { return ii.taskStatus === 3}\n" +
-                        "                          )[0].logDes\n" +
-                        "                        ).gzldata[0].value1 }";
-                Object xchs = JSUtils.runjs(runjs);
 
-                runjs = commjs+"return JSON.parse(\n" +
-                        "                          taskinfo.tblTaskLogList.filter(\n" +
-                        "                            function(ii) { return ii.taskStatus === 3}\n" +
-                        "                          )[0].logDes\n" +
-                        "                        ).czff }";
-                Object czff = JSUtils.runjs(runjs);