From 3f446e63a66ca94a35355e17f0149086424254d7 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 1 Jun 2021 10:09:45 +0800
Subject: [PATCH]  * Fix bug 12732.

---
 module/project/model.php | 17 +++++++++--------
 module/upgrade/model.php | 31 ++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 9fac539104..a90d45c753 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -757,14 +757,15 @@ class projectModel extends model
             {
                 /* If parent not empty, link products or create products. */
                 $product = new stdclass();
-                $product->name         = $this->post->productName ? $this->post->productName : $project->name;
-                $product->bind         = $this->post->parent ? 0 : 1;
-                $product->program      = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
-                $product->acl          = $project->acl = 'open' ? 'open' : 'private';
-                $product->PO           = $project->PM;
-                $product->createdBy    = $this->app->user->account;
-                $product->createdDate  = helper::now();
-                $product->status       = 'normal';
+                $product->name           = $this->post->productName ? $this->post->productName : $project->name;
+                $product->bind           = $this->post->parent ? 0 : 1;
+                $product->program        = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
+                $product->acl            = $project->acl = 'open' ? 'open' : 'private';
+                $product->PO             = $project->PM;
+                $product->createdBy      = $this->app->user->account;
+                $product->createdDate    = helper::now();
+                $product->status         = 'normal';
+                $product->createdVersion = $this->config->version;
 
                 $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
                 $productID = $this->dao->lastInsertId();
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 21672ab41c..4231747f6f 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -674,6 +674,10 @@ class upgradeModel extends model
             $this->execSQL($this->getUpgradeFile('15.0'));
             $this->updateProjectLifeTime();
             $this->appendExec('15_0');
+        case '15_0_1':
+            $this->saveLogs('Execute 15_0_1');
+            $this->updateProductVersion();
+            $this->appendExec('15_0_1');
         }
 
         $this->deletePatch();
@@ -4635,13 +4639,14 @@ class upgradeModel extends model
             if(isset($data->name))
             {
                 $product = new stdclass();
-                $product->program     = $data->program;
-                $product->name        = $data->name;
-                $product->acl         = 'open';
-                $product->PO          = isset($this->app->user->account) ? $this->app->user->account : '';
-                $product->createdBy   = isset($this->app->user->account) ? $this->app->user->account : '';
-                $product->createdDate = helper::now();
-                $product->status      = 'normal';
+                $product->program        = $data->program;
+                $product->name           = $data->name;
+                $product->acl            = 'open';
+                $product->PO             = isset($this->app->user->account) ? $this->app->user->account : '';
+                $product->createdBy      = isset($this->app->user->account) ? $this->app->user->account : '';
+                $product->createdDate    = helper::now();
+                $product->status         = 'normal';
+                $product->createdVersion = $this->config->version;
 
                 $this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
                 $productID = $this->dao->lastInsertID();
@@ -5050,4 +5055,16 @@ class upgradeModel extends model
 
         return true;
     }
+
+    /**
+     * Update the createdVersion field of the zt_product table.
+     *
+     * @access public
+     * @return void
+     */
+    public function updateProductVersion()
+    {
+        $this->dao->update(TABLE_PRODUCT)->set('createdVersion')->eq($this->config->version)->where('createdVersion')->eq('')->exec();
+        return true;
+    }
 }