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

* Batch edit one branch error.

Browse Source
This commit is contained in:
xieqiyu
2021-11-10 10:51:09 +08:00
parent 820fbef7b4
commit b185ef3ba9
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/model.php
+9 -20
View File
@@ -201,33 +201,20 @@ class branchModel extends model
if($branchID == BRANCH_MAIN)
{
$newMainBranch = new stdClass();
if($data->default == BRANCH_MAIN)
{
$this->dao->update(TABLE_BRANCH)
->set('default')->eq(0)
->where('product')->eq($productID)
->exec();
if(dao::isError()) die(js::error('branch#' . $branchID . dao::getError(true)));
$newMainBranch->default = 1;
}
else
{
$newMainBranch->default = 0;
}
$newMainBranch->default = (isset($data->default) and $data->default == BRANCH_MAIN) ? 1 : 0;
$changes[$branchID] = common::createChanges($oldBranchList[BRANCH_MAIN], $newMainBranch);
}
else
{
$branch = new stdclass();
$branch->name = $data->name[$branchID];
$branch->desc = $data->desc[$branchID];
$branch->status = $data->status[$branchID];
$branch->default = $branchID == $data->default ? 1 : 0;
$branch->name = $data->name[$branchID];
$branch->desc = $data->desc[$branchID];
$branch->status = $data->status[$branchID];
$branch->default = (isset($data->default) and $branchID == $data->default) ? 1 : 0;
$branch->closedDate = $branch->status == 'closed' ? helper::today() : '';
$this->dao->update(TABLE_BRANCH)->data($branch)
$this->dao->update(TABLE_BRANCH)->data($branch, 'default')
->batchCheck($this->config->branch->create->requiredFields, 'notempty')
->where('id')->eq($branchID)
->exec();
@@ -238,6 +225,8 @@ class branchModel extends model
}
}
if(isset($data->default)) $this->setDefault($productID, $data->default);
return $changes;
}