Merge branch 'zenops_41' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_41

2022-08-18 13:20:35 +08:00
parent 2ccdc2c118 7b71377d3c
commit bbe6ce4983
2 changed files with 2 additions and 1 deletions
@@ -130,6 +130,7 @@ class file extends control
        if(!$this->file->checkPriv($file))
        {
            echo(js::alert($this->lang->file->accessDenied));
+            if(isonlybody()) return print(js::reload('parent.parent'));
            return print(js::locate(helper::createLink('my', 'index')));
        }

@@ -565,7 +565,7 @@ class fileModel extends model
        }
        elseif($objectType == 'feedback')
        {
-            $productID     = $this->dao->findById($objectID)->from(TABLE_FEEDBACK)->fetch();
+            $productID     = $this->dao->findById($objectID)->from(TABLE_FEEDBACK)->fetch('product');
            $grantProducts = $this->loadModel('feedback')->getGrantProducts();
            return in_array($productID, array_keys($grantProducts));
        }