Commit 66ded61e by mushishixian

fix

parent 50a5c0d5
...@@ -123,7 +123,7 @@ class SupplierApiController extends Controller ...@@ -123,7 +123,7 @@ class SupplierApiController extends Controller
$transformer = new SupplierTransformer(); $transformer = new SupplierTransformer();
$list['data'] = $transformer->transformList($list['data']); $list['data'] = $transformer->transformList($list['data']);
if (env('LOGIN_DOMAIN') == 'user.liexin.net') { if (env('LOGIN_DOMAIN') == 'user.liexin.net') {
$list['total'] = $list['total'] > 50 ? 50 : $list['total']; // $list['total'] = $list['total'] > 50 ? 50 : $list['total'];
} }
$this->response(0, 'ok', $list['data'], $list['total']); $this->response(0, 'ok', $list['data'], $list['total']);
} }
......
...@@ -119,9 +119,9 @@ class SupplierFilter ...@@ -119,9 +119,9 @@ class SupplierFilter
$inCodeIdSql = "(" . $inCodeIdSql . ")"; $inCodeIdSql = "(" . $inCodeIdSql . ")";
$inUserIdSql = "(" . $inUserIdSql . ")"; $inUserIdSql = "(" . $inUserIdSql . ")";
if ($subordinateCodeIds) { if ($subordinateCodeIds) {
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql or channel_uid REGEXP '$likeSqlRaw') ")); $query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql or channel_uid REGEXP '$likeSqlRaw' or is_type = 1) "));
}else{ }else{
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql)")); $query->whereRaw(DB::raw("(create_uid in $inUserIdSql or is_type = 1)"));
} }
} else { } else {
......
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 sign in to comment