0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 更新子级错误

Browse Source
This commit is contained in:
JaguarJack 2021-04-29 08:47:32 +08:00
parent 364544303a
commit f520d20574
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extend/catcher/base/CatchModel.php
View File

@ -6,7 +6,6 @@ namespace catcher\base;
use catcher\CatchQuery;
use catcher\traits\db\BaseOptionsTrait;
use catcher\traits\db\RewriteTrait;
use catcher\traits\db\TransTrait;
use think\model\concern\SoftDelete;
use catcher\traits\db\ScopeTrait;

19
extend/catcher/traits/db/BaseOptionsTrait.php
View File

@ -162,11 +162,14 @@ trait BaseOptionsTrait
}
/**
* 更新 children field
* 更新下级
*
* @time 2021年04月25日
* @time 2021年04月28日
* @param $parentId
* @param $data
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @return void
*/
protected function updateChildren($parentId, $data)
@ -185,7 +188,7 @@ trait BaseOptionsTrait
$this->recursiveUpdate($parentId, $parentIdField, $data);
}
if (is_string($this->updateChildrenFields)) {
if (is_string($this->updateChildrenFields) && isset($data[$this->updateChildrenFields])) {
$this->recursiveUpdate($parentId, $parentIdField, [
$this->updateChildrenFields => $data[$this->updateChildrenFields]
]);
@ -285,7 +288,15 @@ trait BaseOptionsTrait
}
public function import($fields, $file)
/**
* 模型导入
*
* @time 2021年04月28日
* @param $fields
* @param $file
* @return bool
*/
public function import($fields, $file): bool
{
$excel = new class(array_column($fields, 'field')) extends Reader {