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

Merge branch 'sprint/170_hufangzhou_tree' into 'sprint/170'

Browse Source 
* Fix the bugs.

See merge request easycorp/zentaopms!447
This commit is contained in:
李玉春
2021-11-15 01:05:55 +00:00
parent 5ede27a2c6 e441e4a28d
commit 9e74d7204a
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+1
View File
@@ -4544,6 +4544,7 @@ class storyModel extends model
*/
public function updateStoryByReview($storyID, $oldStory, $story)
{
$now = helper::now();
$reviewerList = $this->getReviewerPairs($storyID, $oldStory->version);
$reviewedBy = explode(',', trim($story->reviewedBy, ','));
if(!array_diff(array_keys($reviewerList), $reviewedBy))
module/task/model.php
+1 -1
View File
@@ -2495,7 +2495,7 @@ class taskModel extends model
/* Delayed or not?. */
if($task->status !== 'done' and $task->status !== 'cancel' and $task->status != 'closed')
{
if(!empty($taks->deadline) and !helper::isZeroDate($task->deadline))
if(!empty($task->deadline) and !helper::isZeroDate($task->deadline))
{
$delay = helper::diffDate($today, $task->deadline);
if($delay > 0) $task->delay = $delay;
module/tree/model.php
+1 -1
View File
@@ -857,7 +857,7 @@ class treeModel extends model
if(is_array($extra))
{
$table = $this->config->objectTables[$type];
$objects = $this->dao->select('module')->from($table)->where('product')->eq((int)$extra['rootID'])->andWhere('branch')->eq((int)$extra['branch'])->fetchAll('module');
$objects = $this->dao->select('module')->from($table)->where('product')->eq((int)$extra['rootID'])->andWhere('branch')->eq($extra['branch'])->fetchAll('module');
}
else
{