Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master_xieqiyu_21468' into 'master'

Browse Source 
* Fix bug#21468.

See merge request easycorp/zentaopms!2787
This commit is contained in:
孙广明
2022-04-07 06:41:25 +00:00
parent 6c7711949e 7892d031e4
commit 55832ef09f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+3
View File
@@ -39,6 +39,8 @@ class todoModel extends model
->setIF($this->post->date == false, 'date', '2030-01-01')
->setIF($this->post->begin == false, 'begin', '2400')
->setIF($this->post->begin == false or $this->post->end == false, 'end', '2400')
->setIF($this->post->status == 'done', 'finishedBy', $this->app->user->account)
->setIF($this->post->status == 'done', 'finishedDate', helper::now())
->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)
->remove(implode(',', $this->config->todo->moduleList) . ',uid')
->get();
@@ -521,6 +523,7 @@ class todoModel extends model
->beginIF($type == 'assignedtoother')->andWhere('account', true)->eq($account)->fi()
->beginIF($type != 'assignedtoother')->andWhere('assignedTo', true)->eq($account)->fi()
->orWhere('finishedBy')->eq($account)
->orWhere('closedBy')->eq($account)
->markRight(1)
->beginIF($begin)->andWhere('date')->ge($begin)->fi()
->beginIF($end)->andWhere('date')->le($end)->fi()