|
...
|
...
|
@@ -42,7 +42,9 @@ class CategoryController extends BaseController |
|
|
|
$v['image_link'] = getImageUrl($v['image']);
|
|
|
|
$list[$k] = $v;
|
|
|
|
}
|
|
|
|
$data = $this->getListSon($list);
|
|
|
|
if(!isset($this->map['title'])){
|
|
|
|
$data = $this->getListSon($list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return $this->response('success',Code::SUCCESS,$data);
|
|
|
|
}
|
|
...
|
...
|
@@ -58,10 +60,6 @@ class CategoryController extends BaseController |
|
|
|
if(!empty($this->map['title'])){
|
|
|
|
$this->map['title'] = ['like','%'.$this->map['title'].'%'];
|
|
|
|
}
|
|
|
|
if(!empty($this->map['search'])){
|
|
|
|
$this->map['title'] = ['like','%'.$this->map['search'].'%'];
|
|
|
|
}
|
|
|
|
unset($this->map['search']);
|
|
|
|
$this->map['project_id'] = $this->user['project_id'];
|
|
|
|
return $this->map;
|
|
|
|
}
|
...
|
...
|
|