Merge branch 'master_xieqiyu_25764' into 'master'

* Fix bug#25764.

See merge request easycorp/zentaopms!4685

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));
     }
 }

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;
     }