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

Merge branch 'master_xieqiyu_18080' into 'master'

Browse Source 
* Fix bug#18080.

See merge request easycorp/zentaopms!2837
This commit is contained in:
孙广明
2022-04-11 09:24:46 +00:00
parent 4a1d446587 a60f498ea8
commit bccf6e5248
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+6 -1
View File
@@ -1194,6 +1194,12 @@ class taskModel extends model
$task->consumed = $oldTask->consumed;
$task->parent = $oldTask->parent;
if(empty($task->closedReason))
{
if($oldTask->status == 'done') $task->closedReason = 'done';
if($oldTask->status == 'cancel') $task->closedReason = 'cancel';
}
if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline)
{
$task->version = $oldTask->version + 1;
@@ -1335,7 +1341,6 @@ class taskModel extends model
->checkIF($task->status == 'done' and $task->closedReason, 'closedReason', 'equal', 'done')
->batchCheckIF($task->status == 'done', 'canceledBy, canceledDate', 'empty')
->checkIF($task->status == 'closed', 'closedReason', 'notempty')
->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
->where('id')->eq((int)$taskID)
->exec();