同步逻辑修改

app/Http/Services/SyncSupplierService.php

@@ -294,8 +294,8 @@ class SyncSupplierService
         foreach ($suppliers as $supplier) {
         foreach ($suppliers as $supplier) {
             //判断是否是同名多供应商,如果是的话,如果是之前已经禁用的,则直接跳过
             //判断是否是同名多供应商,如果是的话,如果是之前已经禁用的,则直接跳过
             if (count($suppliers) > 1) {
             if (count($suppliers) > 1) {
-                if ($supplier['status'] == SupplierChannelModel::STATUS_DISABLE) {
-                    Log::warning("检测到同名供应商并且属于禁用状态,跳过,供应商id为 : " . $supplier['supplier_id']);
+                if ($supplier['status'] == SupplierChannelModel::STATUS_DISABLE && $supplier['is_entity'] != SupplierChannelModel::IS_ENTITY_NEED_CONFIRM) {
+                    Log::warning("检测到同名供应商并且属于禁用(实体名单不为待处理)状态,跳过,供应商id为 : " . $supplier['supplier_id']);
                     continue;
                     continue;
                 }
                 }
             }
             }