Commit 9bf84d05 authored by clone's avatar clone

bug

parent 06b2cb84
...@@ -608,7 +608,8 @@ class OrderLogService ...@@ -608,7 +608,8 @@ class OrderLogService
* @param $list * @param $list
* @return array * @return array
*/ */
public function arr2TreeBargain($list) { public function arr2TreeBargain($list)
{
$tree = $trees = []; $tree = $trees = [];
foreach ($list as $key => $item) { foreach ($list as $key => $item) {
...@@ -1125,12 +1126,12 @@ class OrderLogService ...@@ -1125,12 +1126,12 @@ class OrderLogService
$list = []; $list = [];
foreach ($result as $k => $v) { foreach ($result as $k => $v) {
$father_id = $v["father_id"]; $father_id = $v["father_id"];
if($father_id > 0 && in_array($father_id, $list)){ if ($father_id > 0 && in_array($father_id, $list)) {
unset($result[$k]); unset($result[$k]);
}else{ } else {
$result[$k]["create_time"] = date("Y-m-d", strtotime($v["create_time"])); $result[$k]["create_time"] = date("Y-m-d", strtotime($v["create_time"]));
$result[$k]["id"] = $v["father_id"]; $result[$k]["id"] = $v["father_id"] == 0 ? $v["id"] : $v["father_id"];
array_push($list,$father_id); array_push($list, $father_id);
} }
} }
$sortResult = []; $sortResult = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment