Merge branch 'sprint/master_zhouxudong_22032' into 'master'

Sprint/master zhouxudong 22032 See merge request easycorp/zentaopms!3197
2022-04-28 10:31:22 +00:00
parent 1d9f9c0e75 8ac71d35c5
commit c7c2c75870
1 changed files with 8 additions and 0 deletions
@@ -1299,6 +1299,14 @@ class actionModel extends model
            $action->objectLabel = $objectLabel;
            $action->product     = trim($action->product, ',');

+            $noLinkObjects = array('program', 'project', 'product', 'execution');
+            if(in_array($action->objectType, $noLinkObjects))
+            {
+                $objectTable   = zget($this->config->objectTables, $action->objectType);
+                $objectDeleted = $this->dao->select('deleted')->from($objectTable)->where('id')->eq($action->objectID)->fetch('deleted');
+                if($objectDeleted) return $action;
+            }
+
            if($this->config->edition == 'max'
               and strpos($this->config->action->assetType, $action->objectType) !== false
               and empty($action->project) and empty($action->product) and empty($action->execution))