供应商名称

app/Http/Validators/SupplierValidator.php

@@ -32,23 +32,21 @@ class SupplierValidator
             return '供应商名称不能为空';
             return '供应商名称不能为空';
         }
         }
 
 
-        if ($validateData['supplier_name']) {
-            //新增的时候要先去检验下一体化的数据,如果是实体黑名单用户,那么就不允许新增
-            $regionType = $validateData['region'] == SupplierChannelModel::REGION_CN ? 1 : 2;
-            //还要校验提交上来的公司是否有合法信息
-            $unitedCompanyInfo = (new CompanyService())->getUnitedCompanyInfo($validateData['supplier_name'],
-                $validateData['tax_number'],
-                $regionType);
-            $unitedInfo = $unitedCompanyInfo['united_company_info'];
-            if ($unitedInfo && $isAdd) {
-                if ($unitedInfo['is_entity'] == 1) {
-                    return '该供应商已经被一体化系统加入黑名单,不能新增';
-                }
+        //新增的时候要先去检验下一体化的数据,如果是实体黑名单用户,那么就不允许新增
+        $regionType = $validateData['region'] == SupplierChannelModel::REGION_CN ? 1 : 2;
+        //还要校验提交上来的公司是否有合法信息
+        $unitedCompanyInfo = (new CompanyService())->getUnitedCompanyInfo($validateData['supplier_name'],
+            $validateData['tax_number'],
+            $regionType);
+        $unitedInfo = $unitedCompanyInfo['united_company_info'];
+        if ($unitedInfo && $isAdd) {
+            if ($unitedInfo['is_entity'] == 1) {
+                return '该供应商已经被一体化系统加入黑名单,不能新增';
+            }
 
 
-                if ($unitedInfo['company_category'] != '') {
-                    if ($unitedInfo['company_category'] != '普通供应商') {
-                        return '该供应商已经被一体化系统加入黑名单,不能新增';
-                    }
+            if ($unitedInfo['company_category'] != '') {
+                if ($unitedInfo['company_category'] != '普通供应商') {
+                    return '该供应商已经被一体化系统加入黑名单,不能新增';
                 }
                 }
             }
             }
         }
         }
@@ -133,7 +131,7 @@ class SupplierValidator
         if (!$isAdd) {
         if (!$isAdd) {
             $supplier = SupplierChannelModel::where('supplier_id', $validateData['supplier_id'])
             $supplier = SupplierChannelModel::where('supplier_id', $validateData['supplier_id'])
                 ->first()->toArray();
                 ->first()->toArray();
-            if ($supplier['create_time'] < Carbon::createFromDate(2022,6,30)->timestamp) {
+            if ($supplier['create_time'] < Carbon::createFromDate(2022, 6, 30)->timestamp) {
                 $rules['registered_capital'] = '';
                 $rules['registered_capital'] = '';
             }
             }
         }
         }