diff --git a/module/doc/control.php b/module/doc/control.php index e03ea4ad35..73793a443f 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1566,7 +1566,7 @@ class doc extends control if($object->acl == 'open') return print(''); $this->loadModel('user'); - $userViews = $this->dao->select('*')->from(TABLE_USERVIEW)->where('account')->in($accounts)->fetchAll('account'); + $userViews = $this->mao->select('*')->from(TABLE_USERVIEW)->where('account')->in($accounts)->fetchAll('account'); $userPairs = $this->dao->select('account,realname')->from(TABLE_USER)->where('account')->in($accounts)->fetchPairs('account', 'realname'); $denyUsers = array(); foreach($accounts as $account) diff --git a/module/personnel/model.php b/module/personnel/model.php index 97186cc690..7e671dfae3 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -683,7 +683,7 @@ class personnelModel extends model $newWhitelist = str_replace(',' . $account, '', $product->whitelist); $this->dao->update(TABLE_PRODUCT)->set('whitelist')->eq($newWhitelist)->where('id')->eq($productID)->exec(); - $viewProducts = $this->dao->select('products')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('products'); + $viewProducts = $this->mao->select('products')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('products'); $newViewProducts = trim(str_replace(",{$productID},", '', ",{$viewProducts},"), ','); $this->dao->update(TABLE_USERVIEW)->set('products')->eq($newViewProducts)->where('account')->eq($account)->exec(); } @@ -725,7 +725,7 @@ class personnelModel extends model $newWhitelist = str_replace(',' . $account, '', $program->whitelist); $this->dao->update(TABLE_PROGRAM)->set('whitelist')->eq($newWhitelist)->where('id')->eq($programID)->exec(); - $viewPrograms = $this->dao->select('programs')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('programs'); + $viewPrograms = $this->mao->select('programs')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('programs'); $newViewPrograms = trim(str_replace(",{$programID},", '', ",{$viewPrograms},"), ','); $this->dao->update(TABLE_USERVIEW)->set('programs')->eq($newViewPrograms)->where('account')->eq($account)->exec(); } @@ -770,7 +770,7 @@ class personnelModel extends model $newWhitelist = str_replace(',' . $account, '', $project->whitelist); $this->dao->update(TABLE_PROJECT)->set('whitelist')->eq($newWhitelist)->where('id')->eq($projectID)->exec(); - $viewProjects = $this->dao->select('projects')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('projects'); + $viewProjects = $this->mao->select('projects')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('projects'); $newViewProjects = trim(str_replace(",{$projectID},", '', ",{$viewProjects},"), ','); $this->dao->update(TABLE_USERVIEW)->set('projects')->eq($newViewProjects)->where('account')->eq($account)->exec(); } @@ -807,7 +807,7 @@ class personnelModel extends model $newWhitelist = str_replace(',' . $account, '', $execution->whitelist); $this->dao->update(TABLE_EXECUTION)->set('whitelist')->eq($newWhitelist)->where('id')->eq($executionID)->exec(); - $viewExecutions = $this->dao->select('sprints')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('sprints'); + $viewExecutions = $this->mao->select('sprints')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch('sprints'); $newViewExecutions = trim(str_replace(",{$executionID},", '', ",{$viewExecutions},"), ','); $this->dao->update(TABLE_USERVIEW)->set('sprints')->eq($newViewExecutions)->where('account')->eq($account)->exec(); } diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 8ccbb95112..33d509ae86 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -6720,7 +6720,7 @@ class upgradeModel extends model $productGroup = $this->dao->select('id,program')->from(TABLE_PRODUCT)->where('program')->in(array_keys($programs))->andWhere('acl')->ne('open')->fetchGroup('program', 'id'); if(empty($productGroup)) return true; - $userView = $this->dao->select('*')->from(TABLE_USERVIEW)->where('account')->in(array_values($programs))->fetchAll('account', false); + $userView = $this->mao->select('*')->from(TABLE_USERVIEW)->where('account')->in(array_values($programs))->fetchAll('account'); foreach($programs as $programID => $programPM) { if(empty($productGroup[$programID])) continue; diff --git a/module/user/model.php b/module/user/model.php index 34733e8b25..6a85ab135a 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1900,7 +1900,7 @@ class userModel extends model if(empty($account)) $account = $this->session->user->account; if(empty($account)) return $userView; - $userView = $this->dao->select('*')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch(); + $userView = $this->mao->select('*')->from(TABLE_USERVIEW)->where('account')->eq($account)->fetch(); if(!empty($userView) && !$force) return $userView; /* Init objects. */ @@ -2167,7 +2167,7 @@ class userModel extends model /* 如果没传users参数,则获取项目集关联的所有人。*/ if(empty($users)) $authedUsers += $this->getObjectsAuthedUsers($programs, 'program', $stakeholderGroup, array(), $whiteListGroup, $programAdmins, $parentStakeholderGroup, $parentPMGroup); - $userViews = $this->dao->select("account,programs")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'programs'); + $userViews = $this->mao->select("account,programs")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'programs'); /* Judge auth and update view. */ foreach($authedUsers as $account) @@ -2232,7 +2232,7 @@ class userModel extends model if(empty($users)) $authedUsers += $this->getObjectsAuthedUsers($projects, 'project', $stakeholderGroup, $teamsGroup, $whiteListGroup, $projectAdmins, $parentStakeholderGroup, array()); /* Get all projects user view. */ - $userViews = $this->dao->select("account,projects")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'projects'); + $userViews = $this->mao->select("account,projects")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'projects'); /* Judge auth and update view. */ foreach($authedUsers as $account) @@ -2292,7 +2292,7 @@ class userModel extends model if(empty($users)) $authedUsers += $this->getObjectsAuthedUsers($products, 'product', $stakeholderGroup, $teamsGroup, $whiteListGroup, $productAdmins, array(), array()); /* Get all products user view. */ - $userViews = $this->dao->select("account,products")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'products'); + $userViews = $this->mao->select("account,products")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'products'); /* Judge auth and update view. */ foreach($authedUsers as $account) @@ -2353,7 +2353,7 @@ class userModel extends model $authedUsers = $users; if(empty($users)) $authedUsers += $this->getObjectsAuthedUsers($sprints, 'sprint', $stakeholderGroup, $teamsGroup, $whiteListGroup, $executionAdmins, array(), array()); - $userViews = $this->dao->select("account,sprints")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'sprints'); // Get all sprints user view. + $userViews = $this->mao->select("account,sprints")->from(TABLE_USERVIEW)->where('account')->in($authedUsers)->fetchPairs('account', 'sprints'); // Get all sprints user view. foreach($authedUsers as $account) { $view = isset($userViews[$account]) ? $userViews[$account] : ''; @@ -2505,7 +2505,7 @@ class userModel extends model if($program->parent != 0 && $program->acl == 'program') { $path = str_replace(",{$program->id},", ',', "{$program->path}"); - $parents = $this->dao->select('openedBy,PM')->from(TABLE_PROGRAM)->where('id')->in($path)->fetchAll(); + $parents = $this->mao->select('openedBy,PM')->from(TABLE_PROGRAM)->where('id')->in($path)->fetchAll(); foreach($parents as $parent) { /* 当前用户是其中一个父项目集的PM或创建者则判断为有权限。 */ @@ -2552,7 +2552,7 @@ class userModel extends model if($project->type == 'project' && $project->parent != 0 && $project->acl == 'program') { $path = str_replace(",{$project->id},", ',', "{$project->path}"); - $programs = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll(); + $programs = $this->mao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll(); foreach($programs as $program) { /* 当前用户是其中一个父项目集的PM或创建者则判断为有权限。 */ @@ -2563,7 +2563,7 @@ class userModel extends model /* 如果是迭代并且是私有的,则检查所属项目的权限。 */ if(($project->type == 'sprint' || $project->type == 'stage' || $project->type == 'kanban') && $project->acl == 'private') { - $project = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch(); + $project = $this->mao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch(); if(empty($project)) return false; /* 当前用户是所属项目的PM或创建者则判断为有权限。 */ @@ -2635,7 +2635,7 @@ class userModel extends model if($program->parent != 0 && $program->acl == 'program') { $path = str_replace(",{$program->id},", ',', "{$program->path}"); - $parents = $this->dao->select('openedBy,PM')->from(TABLE_PROGRAM)->where('id')->in($path)->fetchAll(); + $parents = $this->mao->select('openedBy,PM')->from(TABLE_PROGRAM)->where('id')->in($path)->fetchAll(); foreach($parents as $parent) { $users[$parent->openedBy] = $parent->openedBy; @@ -2679,7 +2679,7 @@ class userModel extends model if($project->type == 'project' && $project->parent != 0 && $project->acl == 'program') { $path = str_replace(",{$project->id},", ',', "{$project->path}"); - $programs = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll(); + $programs = $this->mao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->in($path)->fetchAll(); foreach($programs as $program) { $users[$program->openedBy] = $program->openedBy; @@ -2690,7 +2690,7 @@ class userModel extends model /* 如果是迭代类型并且是私有的,则所属项目的PM和创建者是关系人。 */ if(($project->type == 'sprint' || $project->type == 'stage' || $project->type == 'kanban') && $project->acl == 'private') { - $parent = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch(); + $parent = $this->mao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch(); if($parent) { $users[$parent->openedBy] = $parent->openedBy;