1

application/admin/controller/Customer.php

@@ -1577,26 +1577,18 @@ class Customer extends Base
 //                }
 
                 // 判断公司
-                if (empty($v[1])) {
-                    $error[] = [
-                        'rows'    => $k,
-                        'msg'     => '公司名称不能为空',
-                        'content' => $v[1],
-                        'uni'     => $uni,
-                    ];
-                    $status = 0; // 设置为0标识此行有错误
-                }
-
-//                // 判断邮件
-//                if (!filter_var($v[2], FILTER_VALIDATE_EMAIL)) {
+//                if (empty($v[1])) {
 //                    $error[] = [
 //                        'rows'    => $k,
-//                        'msg'     => '邮箱格式不正确',
-//                        'content' => $v[2],
+//                        'msg'     => '公司名称不能为空',
+//                        'content' => $v[1],
 //                        'uni'     => $uni,
 //                    ];
 //                    $status = 0; // 设置为0标识此行有错误
 //                }
+
+//                // 判断邮件
+//
                 if (!empty($v[2])) {
                     $checkEmail = Db::name('customer')->wehre('emial',$v[2])->where('spread_id',session('uid'))->find();
                     if ($checkEmail) {
@@ -1607,6 +1599,16 @@ class Customer extends Base
                             'uni'     => $uni,
                         ];
                         $status = 0; // 设置为0标识此行有错误
+                    } else {
+                        if (!filter_var($v[2], FILTER_VALIDATE_EMAIL)) {
+                            $error[] = [
+                                'rows'    => $k,
+                                'msg'     => '邮箱格式不正确',
+                                'content' => $v[2],
+                                'uni'     => $uni,
+                            ];
+                            $status = 0; // 设置为0标识此行有错误
+                        }
                     }
                 }
                 $customer_chengk = new CustomerModel();
@@ -1620,7 +1622,7 @@ class Customer extends Base
                     $status = 0; // 设置为0标识此行有错误
                 }
                 if (!empty($v[2])) {
-                    $ckeckWebsiteCompany = Db::name('customer')->where('company',$v[1])->where('website',$v[3])->where('status',0)->where('email','')->find();
+                    $ckeckWebsiteCompany = Db::name('customer')->where('website','like','%'.$v[3].'%')->where('status',0)->where('email','')->find();
                     if ($ckeckWebsiteCompany) {
                         Db::name('customer')->where('id',$ckeckWebsiteCompany['id'])->update(['spread_id'=>session('uid'),'emial' => $v[2]]);
                         Db::name('customer')->where('emial',$v[2])->setInc('people',1);

application/admin/model/CustomerModel.php

@@ -88,7 +88,7 @@ class CustomerModel extends Model
          $where = [
 //             'name' => $data['name'],
              'email' => $data['email'],
-             'company' => $data['company'],
+//             'company' => $data['company'],
 //             'country' => $data['country'],
              'website' => $data['website'],
 //             'phone' => $data['phone'],
@@ -99,7 +99,7 @@ class CustomerModel extends Model
          if ($isset) return json(['cdoe' => 100, 'msg' => '此客户已存在']);
          $issets = $this->where($where)->where('status','in','1,2,3')->find();
          if ($issets) return json(['cdoe' => 100, 'msg' => '此客户状态已经发生改变，无法添加']);
-         $issetss = $this->where('email','')->where('company' , $data['company'])->where('website' , $data['website'])->where('status',0)->find();
+         $issetss = $this->where('email','')->where('website' , 'like','%'.$data['website'].'%')->where('status',0)->find();
          if ($issetss) {
              Db::name('customer')->where('id'.$issetss['id'])->update(['spread_id' => session('uid')]);
              Db::name('customer')->where('id'.$issetss['id'])->setInc('people',1);
@@ -135,7 +135,7 @@ class CustomerModel extends Model
      */
     public function checkCustomer($email,$company,$website)
     {
-        return  $this->where('email',$email)->where('company',$company)->where('website','like','%'.$website.'%')->where('status','in','1,2,3')->find();
+        return  $this->where('email',$email)->where('website','like','%'.$website.'%')->where('status','in','1,2,3')->find();
     }
     /**
      * 建档人数检测