Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug.

Browse Source
This commit is contained in:
leiyong
2021-02-01 08:17:23 +08:00
parent 458b1e09b0
commit 450aa98ce0
10 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+4 -4
View File
@@ -102,7 +102,7 @@ class programModel extends model
*/
public function getPGMByID($programID = 0)
{
return $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->fetch();
return $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($programID)->andWhere('`type`')->eq('program')->fetch();
}
/**
@@ -828,7 +828,7 @@ class programModel extends model
$currentProjectName = $this->lang->program->common;
if($projectID)
{
$currentProject = $this->project->getById($projectID);
$currentProject = $this->getPRJById($projectID);
$currentProjectName = $currentProject->name;
}
@@ -919,9 +919,9 @@ class programModel extends model
*/
public function getPRJByID($projectID)
{
if(!$projectID) return false;
$project = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->andWhere('`type`')->eq('project')->fetch();
if(!$project) return false;
$project = $this->dao->findById($projectID)->from(TABLE_PROJECT)->fetch();
if($project->end == '0000-00-00') $project->end = '';
return $project;
}