Merge pull request !92 from koastal/master

2017-07-17 21:53:55 +08:00 · 2017-07-17 21:53:55 +08:00 · 39b2d311a7
parent bfeedb8211 9451fab27b
commit 39b2d311a7
1 changed files with 1 additions and 1 deletions
--- a/upload/source/class/table/table_common_task.php
+++ b/upload/source/class/table/table_common_task.php
@ -70,7 +70,7 @@ class table_common_task extends discuz_table
 			case 'canapply':
 			case 'new':
 			default:
-				$status = "'".TIMESTAMP."' > starttime AND (mt.taskid IS NULL OR (ABS(mt.status)='1' AND t.period>0))";
+				$status = "'".TIMESTAMP."' > starttime AND (endtime=0 OR endtime>'".TIMESTAMP."') AND (mt.taskid IS NULL OR (ABS(mt.status)='1' AND t.period>0))";
 				break;
 		}
 		return DB::fetch_all("SELECT t.*, mt.csc, mt.dateline FROM %t t