From c4c2356bf32adb5ed2d4fa49b8ce762161580345 Mon Sep 17 00:00:00 2001
From: liumengyi <z@LAPTOP-OE6H04IJ.localdomain>
Date: Thu, 11 Nov 2021 11:25:53 +0800
Subject: [PATCH] * Finish task #43909.

---
 module/report/view/workload.html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php
index e3cf57c4d2..6c0d607346 100644
--- a/module/report/view/workload.html.php
+++ b/module/report/view/workload.html.php
@@ -70,7 +70,9 @@
             <thead>
               <tr class='colhead text-center'>
                 <th class="c-user"><?php echo $lang->report->user;?></th>
+                <?php if($this->config->systemMode == 'new'):?>
                 <th class="c-project"><?php echo $lang->report->project ;?>
+                <?php endif;?>
                 <th><?php echo $lang->report->execution;?></th>
                 <th class="c-count"><?php echo $lang->report->task;?></th>
                 <th class="c-hours"><?php echo $lang->report->remain;?></th>
@@ -92,7 +94,7 @@
                 <?php foreach($info['execution'] as $executionName => $executionInfo) $projectCount ++ ;?>
                 <?php foreach($info['execution'] as $executionName => $executionInfo):?>
                 <?php if($projectTimes != 1 || $userTimes != 1) echo "<tr>";?>
-                <?php if($projectTimes == 1):?>
+                <?php if($projectTimes == 1 && $this->config->systemMode == 'new'):?>
 		<td class="text-center" rowspan="<?php echo $projectCount;?>" title="<?php echo $projectName;?>"><?php echo html::a($this->createLink('project', 'view', "projectID={$info['projectID']}"), $projectName);?></td>
                 <?php endif;?>
 		<td class="text-center" title="<?php echo $executionName;?>"><?php echo html::a($this->createLink('execution', 'view', "executionID={$executionInfo['executionID']}"), $executionName);?></td>