Merge branch 'release/21.7.5' into feature/workflowgroup

2025-09-01 05:41:47 +00:00
parent 5661c39e58 171e4ee15d
commit ad5cf920d4
622 changed files with 20057 additions and 2716 deletions
@@ -235,6 +235,7 @@ class programplanModel extends model
        $workingDays   = $this->loadModel('holiday')->getActualWorkingDays($begin, $end);
        foreach($tasksGroup as $group => $tasks)
        {
+            if(!$group) $group = '/'; // 未指派
            $groupID ++;
            $groupKey = $groupID . $group;
            $datas['data'][$groupKey] = $this->programplanTao->buildGroupDataForGantt($groupID, $group, $users);