diff --git a/module/execution/model.php b/module/execution/model.php index 5dbbe6cc68..6e09f64b8f 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -179,8 +179,11 @@ class executionModel extends model if(!empty($this->lang->execution->menu->other['dropMenu']->pssp)) { - $this->lang->execution->menu->pssp = $this->lang->execution->menu->other['dropMenu']->pssp; - $this->lang->execution->menu->auditplan = $this->lang->execution->menu->other['dropMenu']->auditplan; + $this->lang->execution->menu->pssp = $this->lang->execution->menu->other['dropMenu']->pssp; + if(isset($this->lang->execution->menu->other['dropMenu']->auditplan)) + { + $this->lang->execution->menu->auditplan = $this->lang->execution->menu->other['dropMenu']->auditplan; + } $docOrder = 0; foreach($this->lang->execution->menuOrder as $order => $menu) if($menu == 'doc') $docOrder = $order; diff --git a/module/project/model.php b/module/project/model.php index 76f3e08179..d6380bf047 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -190,7 +190,7 @@ class projectModel extends model if($action == 'publishtemplate') return $project->status == 'wait' || $project->status == 'closed'; if($action == 'disabletemplate') return $project->status == 'doing'; - if($action == 'deletedeliverable') return !$project->review && empty($project->builtin); + if($action == 'deletedeliverable') return !$project->review && empty($project->systemList) && $project->status == 'draft'; if($action == 'close') return $project->status != 'closed'; if($action == 'group') return $project->model != 'kanban'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index a843775615..11c4ff61b3 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -12381,6 +12381,8 @@ class upgradeModel extends model $this->dao->insert(TABLE_REVIEWCL)->data($reviewclData)->exec(); $reviewclID = $this->dao->lastInsertID(); + $this->dao->update(TABLE_REVIEWISSUE)->set('listID')->eq($reviewclID)->where('listID')->eq($reviewcl->id)->exec(); + /* 迁移检查清单历史记录。 */ if(empty($reviewclActions[$reviewcl->id])) continue; foreach($reviewclActions[$reviewcl->id] as $action)