From 22327a069c9bed489472738161d8d72dfe85db20 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 27 Jul 2022 15:22:20 +0800
Subject: [PATCH] * Fix bug#25764.

---
 module/product/control.php   | 2 +-
 module/programplan/model.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 66b9a42774..a4a85f41e8 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1551,7 +1551,7 @@ class product extends control
      */
     public function ajaxSetState($productID)
     {
-        $this->session->set('product', (int)$productID);
+        $this->session->set('product', (int)$productID, $this->app->tab);
         $this->send(array('result' => 'success', 'productID' => $this->session->product));
     }
 }
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 1718b6022a..afea4b24d3 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -150,6 +150,7 @@ class programplanModel extends model
     public function getDataForGantt($executionID, $productID, $baselineID = 0, $selectCustom = '', $returnJson = true)
     {
         $this->loadModel('stage');
+        $this->loadModel('execution');
 
         $plans = $this->getStage($executionID, $productID);
         if($baselineID)
@@ -327,7 +328,7 @@ class programplanModel extends model
             }
         }
 
-        $datas['data'] = array_values($datas['data']);
+        $datas['data'] = isset($datas['data']) ? array_values($datas['data']) : array();
 
         return $returnJson ? json_encode($datas) : $datas;
     }