From 2914b834b2fe79532671a07c97ecc8fcf70b1093 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 7 Dec 2020 15:07:28 +0800
Subject: [PATCH] * Merge code.

---
 db/update20.0.alpha1.sql   | 3 +++
 module/product/control.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/db/update20.0.alpha1.sql b/db/update20.0.alpha1.sql
index 7328d126df..191c877ec0 100644
--- a/db/update20.0.alpha1.sql
+++ b/db/update20.0.alpha1.sql
@@ -18,3 +18,6 @@ INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VA
 ('zh-cn', 'custom', 'SRList', '2', '软需', '1'),
 ('zh-cn', 'custom', 'SRList', '3', '故事', '1'),
 ('zh-cn', 'custom', 'SRList', '4', '故事', '1');
+
+TRUNCATE TABLE `zt_block`;
+DELETE FROM `zt_config` WHERE `key` = 'blockInited';
diff --git a/module/product/control.php b/module/product/control.php
index 41a8569a51..293c9c5dfd 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -689,8 +689,8 @@ class product extends control
      */
     public function ajaxGetDropMenu($productID, $module, $method, $extra)
     {
-        $inProduct = zget($this->lang->navGroup, $module) == 'product';
-        $products = $inProduct ? $this->product->getList() : $this->product->getProductsByProject($this->session->PRJ);
+        $inProduct = zget($this->lang->navGroup, $this->app->rawModule) == 'product';
+        $products  = $inProduct ? $this->product->getList() : $this->product->getProductsByProject($this->session->PRJ);
 
         $this->view->link      = $this->product->getProductLink($module, $method, $extra);
         $this->view->productID = $productID;