From df4a2acb64da581a2538bc09b2b8e10a5aaabb92 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Mon, 19 Oct 2020 16:56:15 +0800
Subject: [PATCH] * The programplan module calls the updateUserView method.

---
 db/update20.0.sql              |  4 ++--
 db/zentao.sql                  |  4 ++--
 module/programplan/control.php |  1 -
 module/programplan/model.php   | 11 ++++++++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/db/update20.0.sql b/db/update20.0.sql
index 306b11e57b..90c2f27535 100644
--- a/db/update20.0.sql
+++ b/db/update20.0.sql
@@ -66,7 +66,7 @@ CREATE TABLE `zt_stage` (
 
 -- DROP TABLE IF EXISTS `zt_stakeholder`;
 CREATE TABLE `zt_stakeholder` (
- `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+ `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
  `objectID` mediumint(8) NOT NULL,
  `objectType` char(30) NOT NULL,
  `user` char(30) NOT NULL,
@@ -77,7 +77,7 @@ CREATE TABLE `zt_stakeholder` (
  `createdDate` date NOT NULL,
  `editedBy` char(30) NOT NULL,
  `editedDate` date NOT NULL,
- `deleted` enum('0','1') NOT NULL 
+ `deleted` enum('0','1') NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- DROP TABLE IF EXISTS `zt_expect`;
diff --git a/db/zentao.sql b/db/zentao.sql
index 268483b6fc..22c2ed6980 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -875,7 +875,7 @@ CREATE TABLE `zt_risk` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_stakeholder`;
 CREATE TABLE `zt_stakeholder` (
-  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+  `id` mediumint(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
   `objectID` mediumint(8) NOT NULL,
   `objectType` char(30) NOT NULL,
   `user` char(30) NOT NULL,
@@ -886,7 +886,7 @@ CREATE TABLE `zt_stakeholder` (
   `createdDate` date NOT NULL,
   `editedBy` char(30) NOT NULL,
   `editedDate` date NOT NULL,
-  `deleted` enum('0','1') NOT NULL 
+  `deleted` enum('0','1') NOT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_story`;
 CREATE TABLE IF NOT EXISTS `zt_story` (
diff --git a/module/programplan/control.php b/module/programplan/control.php
index bfc23b1b6b..8f2a9e54e9 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -159,7 +159,6 @@ class programplan extends control
     public function edit($planID = 0, $programID = 0)
     {
         $plan = $this->programplan->getByID($planID);
-        $this->commonAction($plan->program, $plan->product);
 
         if($_POST)
         {
diff --git a/module/programplan/model.php b/module/programplan/model.php
index ba4cb7a573..1ecb708850 100644
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -333,7 +333,7 @@ class programplanModel extends model
      */
     public function getTotalPercent($plan)
     {
-        $plans = $this->getList($plan->program, $plan->product, $plan->parent,'parent');
+        $plans = $this->getList($plan->project, $plan->product, $plan->parent, 'parent');
 
         $totalPercent = 0;
         foreach($plans as $id => $stage)
@@ -508,8 +508,6 @@ class programplanModel extends model
             return false;
         }
 
-        $this->post->set('products', array(0 => $productID));//目前计划阶段用的就是迭代，迭代和产品会有个绑定关系，调用迭代（项目）模块的updateProducts方法来实现这个绑定关系，需要往post里塞入产品数据。
-
         $account = $this->app->user->account;
         $now     = helper::now();
         foreach($datas as $data)
@@ -536,6 +534,8 @@ class programplanModel extends model
                     ->where('id')->eq($planID)
                     ->exec();
 
+                if($data->acl != 'open') $this->loadModel('user')->updateUserView($planID, 'stage');
+
                 if($planChanged)
                 {
                     $spec = new stdclass();
@@ -569,7 +569,11 @@ class programplanModel extends model
                 if(!dao::isError())
                 {
                     $planID = $this->dao->lastInsertID();
+
                     $this->setTreePath($planID);
+                    if($data->acl != 'open') $this->loadModel('user')->updateUserView($planID, 'stage');
+
+                    $this->post->set('products', array(0 => $productID));
                     $this->loadModel('project')->updateProducts($planID);
 
                     $spec = new stdclass();
@@ -671,6 +675,7 @@ class programplanModel extends model
 
         if(dao::isError()) return false;
         $this->setTreePath($planID);
+        if($plan->acl != 'open') $this->loadModel('user')->updateUserView($planID, 'stage');
 
         if($planChanged)
         {