Commit e3deaf5a by mushishixian

fix

parent 66ded61e
...@@ -50,7 +50,7 @@ class SupplierFilter ...@@ -50,7 +50,7 @@ class SupplierFilter
if (!empty($map['status'])) { if (!empty($map['status'])) {
$query->where('status', $map['status']); $query->where('status', $map['status']);
} }
if (!empty($map['is_type'])) { if (isset($map['is_type']) && $map['is_type'] == "0") {
$query->where('is_type', $map['is_type']); $query->where('is_type', $map['is_type']);
} }
if (!empty($map['has_sku'])) { if (!empty($map['has_sku'])) {
...@@ -120,7 +120,7 @@ class SupplierFilter ...@@ -120,7 +120,7 @@ class SupplierFilter
$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' or is_type = 1) ")); $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 or is_type = 1)")); $query->whereRaw(DB::raw("(create_uid in $inUserIdSql or is_type = 1)"));
} }
...@@ -128,7 +128,7 @@ class SupplierFilter ...@@ -128,7 +128,7 @@ class SupplierFilter
if ($codeId) { if ($codeId) {
//剩下的就只是看自己相关的 //剩下的就只是看自己相关的
$query->whereRaw(DB::raw("(create_uid = $userId or purchase_uid = $codeId or channel_uid like '%${codeId}%') ")); $query->whereRaw(DB::raw("(create_uid = $userId or purchase_uid = $codeId or channel_uid like '%${codeId}%') "));
}else{ } else {
$query->whereRaw(DB::raw("(create_uid = $userId)")); $query->whereRaw(DB::raw("(create_uid = $userId)"));
} }
......
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