Merge branch 'master_xieqiyu_75909' into 'master'

* Fix bug#29441.

See merge request easycorp/zentaopms!6135
This commit is contained in:
孙广明
2022-11-14 06:57:28 +00:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -4727,7 +4727,7 @@ class executionModel extends model
}
}
}
if(!empty($execution->division)) echo "<td class='text-left' title='{$execution->productName}'>{$execution->productName}</td>";
if(!empty($execution->division) and $execution->hasProduct) echo "<td class='text-left' title='{$execution->productName}'>{$execution->productName}</td>";
echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
echo '<td>' . zget($users, $execution->PM) . '</td>';
echo helper::isZeroDate($execution->begin) ? '<td class="c-date"></td>' : '<td class="c-date">' . $execution->begin . '</td>';