diff --git a/module/project/model.php b/module/project/model.php index 4ce4be2987..314c8dd1ad 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -424,9 +424,11 @@ class projectModel extends model ->andWhere('t2.deleted')->eq(0) ->andWhere('t1.type')->eq('project') ->fetch('totalHours'); - $workhour->totalEstimate = $totalEstimate; - $workhour->totalConsumed = $totalConsumed; - $workhour->totalLeft = $totalLeft; + + $workhour->totalHours = empty($workhour->totalHours) ? 0 : $workhour->totalHours; + $workhour->totalEstimate = empty($totalEstimate) ? 0 : $totalEstimate; + $workhour->totalConsumed = empty($totalConsumed) ? 0 : $totalConsumed; + $workhour->totalLeft = empty($totalLeft) ? 0 : $totalLeft; return $workhour; } diff --git a/module/project/test/model/getworkhour.php b/module/project/test/model/getworkhour.php index c7befeb046..666a8aff57 100755 --- a/module/project/test/model/getworkhour.php +++ b/module/project/test/model/getworkhour.php @@ -20,6 +20,6 @@ $projectIdList = array(1, 11, 60); global $tester; $tester->loadModel('project'); -r($tester->project->getWorkHour($projectIdList[0])) && p('totalHours') && e('~~'); // 获取不存在项目工时信息 +r($tester->project->getWorkHour($projectIdList[0])) && p('totalHours') && e('0'); // 获取不存在项目工时信息 r($tester->project->getWorkHour($projectIdList[1])) && p('totalEstimate') && e('61'); // 获取项目ID为11的总预计工时 r($tester->project->getWorkHour($projectIdList[2])) && p('totalConsumed') && e('11'); // 获取项目ID为60的总消耗工时