* finish task #6676.

This commit is contained in:
wangyidong
2019-12-16 13:50:56 +08:00
parent 76f4160ffc
commit 2b2671e7ab
+3
View File
@@ -467,8 +467,11 @@ class todoModel extends model
$today = helper::today();
$now = helper::now();
$lastCycleList = $this->dao->select('*')->from(TABLE_TODO)->where('type')->eq('cycle')->andWhere('idvalue')->in(array_keys($todoList))->orderBy('date_asc')->fetchAll('idvalue');
$activedUsers = $this->dao->select('account')->from(TABLE_USER)->where('deleted')->eq(0)->fetchPairs('account', 'account');
foreach($todoList as $todoID => $todo)
{
if(!isset($activedUsers[$todo->account])) continue;
$todo->config = json_decode($todo->config);
$begin = $todo->config->begin;
$end = $todo->config->end;