Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
*fix bug#17639 See merge request easycorp/zentaopms!2237
This commit is contained in:
@@ -1531,10 +1531,6 @@ class projectModel extends model
|
||||
$projectID = (int)$projectID;
|
||||
$projectType = 'project';
|
||||
$accounts = array_unique($accounts);
|
||||
$limited = array_values($limited);
|
||||
$roles = array_values($roles);
|
||||
$days = array_values($days);
|
||||
$hours = array_values($hours);
|
||||
$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();
|
||||
|
||||
@@ -1547,7 +1543,7 @@ class projectModel extends model
|
||||
$member->role = $roles[$key];
|
||||
$member->days = $days[$key];
|
||||
$member->hours = $hours[$key];
|
||||
$member->limited = $limited[$key];
|
||||
$member->limited = isset($limited[$key]) ? $limited[$key] : 'no';
|
||||
|
||||
$member->root = $projectID;
|
||||
$member->account = $account;
|
||||
|
||||
Reference in New Issue
Block a user