Merge branch 'zentaopms_252'

2022-11-08 09:23:23 +08:00
parent bd18396178 df2e70c0cb
commit 8ee88df5de
47 changed files with 453 additions and 90 deletions
@@ -4058,6 +4058,7 @@ class taskModel extends model
            }
        }
        $list .= '</td>';
+        if(!empty($execution->division) and $this->app->rawModule == 'project') $list .= '<td></td>';
        $list .= "<td class='status-{$task->status} text-center'>" . $this->processStatus('task', $task) . '</td>';
        $list .= '<td>' . zget($users, $task->assignedTo, '') . '</td>';
        $list .= helper::isZeroDate($task->estStarted) ? '<td class="c-date"></td>' : '<td class="c-date">' . $task->estStarted . '</td>';