Commit 087c79cf by mushishixian

fix

parent aa314222
......@@ -51,7 +51,11 @@ class SupplierContactApiController extends Controller
$inUserIdSql = implode(',', $subordinateUserIds);
$inCodeIdSql = "(" . $inCodeIdSql . ")";
$inUserIdSql = "(" . $inUserIdSql . ")";
$query->whereRaw(DB::raw("(admin_id in $inUserIdSql or can_check_uids in $inCodeIdSql)"));
if ($inCodeIdSql) {
$query->whereRaw(DB::raw("(admin_id in $inUserIdSql or can_check_uids in $inCodeIdSql)"));
}else{
$query->whereRaw(DB::raw("(admin_id in $inUserIdSql)"));
}
}else{
$query->whereRaw("(can_check_uids = $codeId or admin_id = $adminId)");
}
......
......@@ -118,7 +118,11 @@ class SupplierFilter
$inUserIdSql = implode(',', $subordinateUserIds);
$inCodeIdSql = "(" . $inCodeIdSql . ")";
$inUserIdSql = "(" . $inUserIdSql . ")";
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql or channel_uid REGEXP '$likeSqlRaw') "));
if ($subordinateCodeIds) {
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql or purchase_uid in $inCodeIdSql or channel_uid REGEXP '$likeSqlRaw') "));
}else{
$query->whereRaw(DB::raw("(create_uid in $inUserIdSql)"));
}
} else {
if ($codeId) {
......
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