更新
This commit is contained in:
parent
c08249ce5a
commit
44138fadb3
@ -32,7 +32,11 @@ class MerchantIntentionDao extends BaseDao
|
|||||||
})->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
|
})->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
|
||||||
$query->where('status', (int)$where['status']);
|
$query->where('status', (int)$where['status']);
|
||||||
})->when(isset($where['type']) && $where['type'] !== '', function ($query) use ($where) {
|
})->when(isset($where['type']) && $where['type'] !== '', function ($query) use ($where) {
|
||||||
$query->where('type', (int)$where['type']);
|
if(is_array($where['type'])){
|
||||||
|
$query->whereOr('type',$where['type'][0])->whereOr('type',$where['type'][1]);
|
||||||
|
}else{
|
||||||
|
$query->where('type', (int)$where['type']);
|
||||||
|
}
|
||||||
})->when(isset($where['mer_intention_id']) && $where['mer_intention_id'] !== '', function ($query) use ($where) {
|
})->when(isset($where['mer_intention_id']) && $where['mer_intention_id'] !== '', function ($query) use ($where) {
|
||||||
$query->where('mer_intention_id', $where['mer_intention_id']);
|
$query->where('mer_intention_id', $where['mer_intention_id']);
|
||||||
})->when(isset($where['category_id']) && $where['category_id'] !== '', function ($query) use ($where) {
|
})->when(isset($where['category_id']) && $where['category_id'] !== '', function ($query) use ($where) {
|
||||||
|
@ -389,8 +389,7 @@ class MerchantIntention extends BaseController
|
|||||||
public function lst()
|
public function lst()
|
||||||
{
|
{
|
||||||
[$page, $limit] = $this->getPage();
|
[$page, $limit] = $this->getPage();
|
||||||
// $type = $this->request->get('type', 1);
|
$data = $this->repository->getList(['uid' => $this->userInfo->uid,'type'=>[1,2]], $page, $limit);
|
||||||
$data = $this->repository->getList(['uid' => $this->userInfo->uid], $page, $limit);
|
|
||||||
return app('json')->success($data);
|
return app('json')->success($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user