修复bug

app/Http/Controllers/Filter/SupplierFilter.php

@@ -223,7 +223,8 @@ class SupplierFilter
 
 
         //搜索是否有供应商账号
         //搜索是否有供应商账号
         if (!empty($map['has_supplier_account'])) {
         if (!empty($map['has_supplier_account'])) {
-            $query->has('yunxin_account');
+            $supplierIds = SupplierAccountModel::query()->pluck('supplier_id')->toArray();
+            $query->whereIn('supplier_id', $supplierIds);
         }
         }
 
 
         //搜索是否有合同
         //搜索是否有合同
@@ -252,19 +253,17 @@ class SupplierFilter
                 })->pluck('purchase_id');
                 })->pluck('purchase_id');
 
 
             if ($purchaseIds->isEmpty()) {
             if ($purchaseIds->isEmpty()) {
-
             } else {
             } else {
                 $supplierIds = PurchaseOrderModel::query()
                 $supplierIds = PurchaseOrderModel::query()
                     ->whereIn('purchase_id', $purchaseIds)
                     ->whereIn('purchase_id', $purchaseIds)
                     ->distinct()
                     ->distinct()
                     ->pluck('supplier_id')->unique();
                     ->pluck('supplier_id')->unique();
-
-                if ($supplierIds->isEmpty()) {
-                } else {
-                    $query->whereIn('supplier_id', $supplierIds);
             }
             }
+            if ($map['has_order_contract'] == 1) {
+                $query->whereIn('supplier_id', $supplierIds);
+            } else {
+                $query->whereNotIn('supplier_id', $supplierIds);
             }
             }
-
         }
         }
 
 
         //默认过滤带有-1字符串的供应商名称的数据
         //默认过滤带有-1字符串的供应商名称的数据
@@ -331,7 +330,7 @@ class SupplierFilter
             }
             }
         });
         });
 
 
-        $query->with(['contact', 'attachment','yunxin_account']);
+        $query->with(['contact', 'attachment', 'yunxin_account']);
         $query->whereRaw('supplier_name NOT LIKE "%-1"');
         $query->whereRaw('supplier_name NOT LIKE "%-1"');
 
 
         // 权限逻辑已经移到上面的复合查询条件中
         // 权限逻辑已经移到上面的复合查询条件中