Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/bpm/task/todo/taskTodoList.js

@@ -58,13 +58,14 @@ $(document).ready(function() {
                     var tb = document.getElementById('actTable');    // table 的 id
                     var rows = tb.rows;                           // 获取表格所有行
                     for(var i = 1; i<rows.length; i++ ){
-                    	var time1 = rows[i].cells[4].innerHTML;
+                        if (rows[i].cells[0].innerHTML == "没有找到匹配的记录") {
+							return false;
+						}
+                        var time1 = rows[i].cells[4].innerHTML;
                         var currentDateLong = new Date(time1.replace(new RegExp("-","gm"),"/")).getTime();
-						// alert(currentDateLong);
                         if (new Date().getTime()-currentDateLong>3*24*60*60*1000){
-                        	// alert(new Date().getTime()-currentDateLong)
                             rows[i].style.color = "red";
-						}
+                        }
                     }
 				},
                columns: [/*{