Merge branch 'sprint/170_mayue_16191' into 'sprint/170'

* Fix bug #16191. See merge request easycorp/zentaopms!414
2021-11-11 08:19:38 +00:00
parent 2c296a129b f8eebdf678
commit c8b1eaef62
1 changed files with 1 additions and 1 deletions
@@ -211,7 +211,7 @@ class product extends control

        $product = $this->product->getById($productID);

-        if($product->type != 'normal')
+        if($product and $product->type != 'normal')
        {
            $this->app->loadLang('datatable');
            $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);