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

Merge branch 'zentaopms_207'

Browse Source
This commit is contained in:
孙广明
2022-06-22 08:33:17 +08:00
parent 3e4a4668af 91ec091aa4
commit 34ddc497ba
25 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+8 -2
View File
@@ -1868,9 +1868,7 @@ class projectModel extends model
$projectType = 'project';
$accounts = array_unique($accounts);
$oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->fetchPairs();
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->exec();
$projectMember = array();
foreach($accounts as $key => $account)
{
if(empty($account)) continue;
@@ -1885,6 +1883,14 @@ class projectModel extends model
dao::$errors['message'][] = $this->lang->project->errorHours;
return false;
}
}
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq($projectType)->exec();
$projectMember = array();
foreach($accounts as $key => $account)
{
if(empty($account)) continue;
$member = new stdclass();
$member->role = $roles[$key];