拉黑恢复判断

app/Http/Services/SyncSupplierService.php

@@ -168,9 +168,12 @@ class SyncSupplierService
                 $data['status'] = SupplierChannelModel::STATUS_BLOCK;
                 $data['block_reason'] = '一体化系统黑名单供应商';
             } else {
+                //从拉黑变成审核中,才变成审核中,因为有可能不是修改公司类型,只是修改公司性质
+                if ($supplier['status'] == SupplierChannelModel::STATUS_BLOCK) {
                     $data['status'] = SupplierChannelModel::STATUS_IN_REVIEW;
                 }
             }
+        }
         $data['sync_united_status'] = SupplierChannelModel::SYNC_UNITED_STATUS_OK;
         $data['group_code'] = $groupCode;
         $data['company_nature'] = $syncResult['company_nature'];