Merge branch 'hotfix/search' into dev

master
yulingwei 5 years ago
commit 36131961b4

@ -1960,7 +1960,7 @@ class QueryController extends BaseController
public function getSubPromotes() public function getSubPromotes()
{ {
$promoteId = I('promote_id', 0); $promoteId = I('promote_id', 0) ?: -1;
$promotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promoteId])->select(); $promotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promoteId])->select();
$this->ajaxReturn([ $this->ajaxReturn([
'status' => 1, 'status' => 1,

Loading…
Cancel
Save