From 3ddba6aeeb9c9d6846c98fdcf14d6c85ddeee483 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Wed, 13 Oct 2021 10:17:53 +0800
Subject: [PATCH]  * Fix bug #15479.

---
 module/common/model.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 77fe324f46..75545c6516 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -361,9 +361,21 @@ class commonModel extends model
         $html .= "<i class='icon icon-plus-solid-circle text-secondary'></i>";
         $html .= "</a><ul class='dropdown-menu pull-right create-list'>";
 
+        /* Initialize the default values. */
         $showCreateList = $needPrintDivider = false;
-        $productID      = isset($_SESSION['product']) ? $_SESSION['product'] : 0;
-        if(!$productID and $app->user->view->products) $productID = current(explode(',', $app->user->view->products));
+
+        /* Get default product id. */
+        $deletedProducts   = $app->dbh->query("SELECT id  FROM " . TABLE_PRODUCT . " WHERE `deleted` = '1'")->fetchAll();
+        $deletedProductIds = array();
+        foreach($deletedProducts as $product) $deletedProductIds[] = $product->id;
+
+        $productID = (isset($_SESSION['product']) and !in_array($_SESSION['product'], $deletedProductIds)) ? $_SESSION['product'] : 0;
+        if(!$productID and $app->user->view->products)
+        {
+            $viewProducts = explode(',', $app->user->view->products);
+            $viewProducts = array_diff($viewProducts, $deletedProductIds);
+            $productID    = current($viewProducts);
+        }
 
         /* Check whether the creation permission is available, and print create buttons. */
         foreach($lang->createIcons as $objectType => $objectIcon)