diff --git a/module/group/control.php b/module/group/control.php index e01984ec82..dffa91c984 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -285,7 +285,7 @@ class group extends control $this->view->position = $position; $this->view->allUsers = $allUsers; $this->view->group = $group; - $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('program')->eq(0)->andWhere('deleted')->eq(0)->fetchPairs(); + $this->view->programs = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('program')->eq(0)->andWhere('deleted')->eq(0)->andWhere('isCat')->eq(0)->fetchPairs(); $this->view->deptTree = $this->loadModel('dept')->getTreeMenu($rooteDeptID = 0, array('deptModel', 'createManagePgmAdminLink'), $groupID); $this->view->groupUsers = $groupUsers; $this->view->userPrograms = $userPrograms; diff --git a/module/program/model.php b/module/program/model.php index 0699da9b02..839aaa911b 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -391,8 +391,8 @@ class programModel extends model if($parentProgram) { if($program->begin < $parentProgram->begin) dao::$errors['begin'] = sprintf($this->lang->program->beginLetterParent, $parentProgram->begin); - if($parentProgram->end != '0000-00-00' and $project->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $parentProgram->end); - if(empty($project->end) and $this->post->longTime and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $parentProgram->end); + if($parentProgram->end != '0000-00-00' and $program->end > $parentProgram->end) dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $parentProgram->end); + if(empty($program->end) and $this->post->longTime and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->endGreaterParent, $parentProgram->end); } } if(dao::isError()) return false;