Merge branch '12.x'

2021-02-19 13:17:23 +08:00
parent 3ee2aa34a7 fc28bbfc9e
commit 6bf40e474d
109 changed files with 5297 additions and 1570 deletions
@@ -312,10 +312,6 @@ class tree extends control
        }

        $module = $this->tree->getById($moduleID);
-        if($module->owner == null and $module->root != 0 and $module->type != 'task' and $type != 'doc')
-        {
-            $module->owner = $this->loadModel('product')->getById($module->root)->QD;
-        }

        if($type == 'task')
        {