1

application/admin/controller/Crontab.php

@@ -122,6 +122,7 @@ class Crontab extends Controller
         $success = [];
         $error = [];
 //        var_dump($excel_array);die;
+        $emailStr = '';
         if (!empty($excel_array)) {
             foreach ($excel_array as $k => $v) {
                 $status = 1; // 为1标识此行正常
@@ -129,6 +130,17 @@ class Crontab extends Controller
                 $v[3] = trim($v[3]);
                 // 判断邮件
                 if (!empty($v[2])) {
+                    $domain = strstr($emailStr, $v[2]);
+                    if ($domain) {
+                        $error[] = [
+                            'rows'    => $k,
+                            'msg'     => '邮箱在文档中重复，自动忽略',
+                            'content' => $v[2],
+                            'uni'     => $uni,
+                        ];
+                        $status = 0; // 设置为0标识此行有错误
+                    }
+                    $emailStr = $emailStr.$v[2];
                     $checkEmail = Db::name('customer')->where('email',$v[2])->where('spread_id',$uid)->find();
                     if ($checkEmail) {
                         $error[] = [

application/admin/controller/Upload.php

@@ -442,12 +442,24 @@ class Upload extends Base
                 $tableSerialize = Db::name('serialize')->where('admin_id',session('uid'))->select();
                 return json(['code' => 110,'msg' => '文件导入时间过长，已转入本地导入，五分钟开始', 'data' => $tableSerialize]);
             }
+            $emailStr = '';
             foreach ($excel_array as $k => $v) {
                 $status = 1; // 为1标识此行正常
                 // 判断邮件
                 $v[2] = trim($v[2]);
                 $v[3] = trim($v[3]);
                 if (!empty($v[2])) {
+                    $domain = strstr($emailStr, $v[2]);
+                    if ($domain) {
+                        $error[] = [
+                            'rows'    => $k,
+                            'msg'     => '邮箱在文档中重复，自动忽略',
+                            'content' => $v[2],
+                            'uni'     => $uni,
+                        ];
+                        $status = 0; // 设置为0标识此行有错误
+                    }
+                    $emailStr = $emailStr.$v[2];
                     $checkEmail = Db::name('customer')->where('email',$v[2])->where('spread_id',session('uid'))->find();
                     if ($checkEmail) {
                         $error[] = [