From 541cd5b91cc4ceabaa548ab829d732022708560e Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 25 Feb 2021 13:46:52 +0800 Subject: [PATCH] * Fix bug. --- module/project/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/project/model.php b/module/project/model.php index 96d7287719..23016aaf9b 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2237,12 +2237,13 @@ class projectModel extends model if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembers(); $project = $this->getByID($projectID); + $type = $this->config->global->mode == 'new' ? $project->type : 'project'; if(empty($project)) return array(); return $this->dao->select("t1.*, t1.hours * t1.days AS totalHours, t2.id as userID, if(t2.deleted='0', t2.realname, t1.account) as realname")->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account') ->where('t1.root')->eq((int)$projectID) - ->andWhere('t1.type')->eq($project->type) + ->andWhere('t1.type')->eq($type) ->andWhere('t2.deleted')->eq('0') ->fetchAll('account'); }