1

application/admin/controller/Robot.php

@@ -209,11 +209,17 @@ class Robot extends Base
                 $info[$k]['robot_updateTime'] = date('Y-m-d H:m:s',time());
                 $info[$k]['admin_id'] = session('user_id');
             }
-            //检查表中数据是否有重复
+            //检查表中数据是否为空和重复
             for($a=0;$a<count($info);$a++){
+                if(empty($info[$a]['robot_name'])){
+                    return json(['code' => -3, 'data' => url('robot/index'), 'msg' => 'excel表第'.($a+2).'行智能问答问题为空']);
+                }
+                if(empty($info[$a]['robot_content'])){
+                    return json(['code' => -4, 'data' => url('robot/index'), 'msg' => 'excel表第'.($a+2).'行智能问答答案为空']);
+                }
                 for($b=$a+1;$b<count($info);$b++){
                     if($info[$a]['robot_name'] == $info[$b]['robot_name']){
-                        return json(['code' => -2, 'data' => url('robot/index'), 'msg' => 'excel表第'.($a+1).'行与第'.($b+1).'行智能问答问题重复']);
+                        return json(['code' => -2, 'data' => url('robot/index'), 'msg' => 'excel表第'.($a+2).'行与第'.($b+2).'行智能问答问题重复']);
                     }
                 }
             }
@@ -222,7 +228,7 @@ class Robot extends Base
             for($i=0;$i<count($info);$i++){
                 for($j=0;$j<count($robot);$j++){
                     if($info[$i]['robot_name'] == $robot[$j]['robot_name']){
-                        return json(['code' => -1, 'data' => url('robot/index'), 'msg' => 'excel表第'.($i+1).'行智能问答问题已存在']);
+                        return json(['code' => -1, 'data' => url('robot/index'), 'msg' => 'excel表第'.($i+2).'行智能问答问题已存在']);
                     }
                 }
             }

application/admin/controller/Sensitivec.php

@@ -171,11 +171,14 @@ class Sensitivec extends Base
                 $info[$k]['sensitivewords_time'] = date('Y-m-d H:m:s',time());
                 $info[$k]['sensitivewords_uid'] = session('user_id');
             }
-            //检查表中数据是否有重复
+            //检查表中数据是否为空和重复
             for($a=0;$a<count($info);$a++){
+                if(empty($info[$a]['sensitivewords_word'])){
+                    return json(['code' => -3, 'data' => url('sensitivec/index'), 'msg' => 'excel表第'.($a+2).'行敏感词为空']);
+                }
                 for($b=$a+1;$b<count($info);$b++){
                     if($info[$a]['sensitivewords_word'] == $info[$b]['sensitivewords_word'] && $info[$a]['sensitivewords_for'] == $info[$b]['sensitivewords_for']){
-                        return json(['code' => -1, 'data' => url('sensitivec/index'), 'msg' => 'excel表第'.($a+1).'行与第'.($b+1).'行敏感词重复']);
+                        return json(['code' => -1, 'data' => url('sensitivec/index'), 'msg' => 'excel表第'.($a+2).'行与第'.($b+2).'行敏感词重复']);
                     }
                 }
             }
@@ -184,7 +187,7 @@ class Sensitivec extends Base
             for($i=0;$i<count($info);$i++){
                 for($j=0;$j<count($sensitivewords);$j++){
                     if($info[$i]['sensitivewords_word'] == $sensitivewords[$j]['sensitivewords_word'] && $info[$i]['sensitivewords_for'] == $sensitivewords[$j]['sensitivewords_for']){
-                        return json(['code' => -1, 'data' => url('sensitivec/index'), 'msg' => 'excel表第'.($i+1).'行敏感词已存在']);
+                        return json(['code' => -1, 'data' => url('sensitivec/index'), 'msg' => 'excel表第'.($i+2).'行敏感词已存在']);
                     }
                 }
             }

application/admin/controller/Words.php

@@ -178,11 +178,17 @@ class Words extends Base
                 $info[$k]['user_id'] = 0;
                 $info[$k]['admin_id'] = session('user_id');
             }
-            //检查表中数据是否有重复
+            //检查表中数据是否为空和重复
             for($a=0;$a<count($info);$a++){
+                if(empty($info[$a]['title'])){
+                    return json(['code' => -3, 'data' => url('words/index'), 'msg' => 'excel表第'.($a+2).'行快捷词为空']);
+                }
+                if(empty($info[$a]['content'])){
+                    return json(['code' => -4, 'data' => url('words/index'), 'msg' => 'excel表第'.($a+2).'行内容为空']);
+                }
                 for($b=$a+1;$b<count($info);$b++){
                     if($info[$a]['title'] == $info[$b]['title']){
-                        return json(['code' => -1, 'data' => url('words/index'), 'msg' => 'excel表第'.($a+1).'行与第'.($b+1).'行快捷词重复']);
+                        return json(['code' => -1, 'data' => url('words/index'), 'msg' => 'excel表第'.($a+2).'行与第'.($b+2).'行快捷词重复']);
                     }
                 }
             }
@@ -191,7 +197,7 @@ class Words extends Base
             for($i=0;$i<count($info);$i++){
                 for($j=0;$j<count($words);$j++){
                     if($info[$i]['title'] == $words[$j]['title']){
-                        return json(['code' => -1, 'data' => url('words/index'), 'msg' => 'excel表第'.($i+1).'行快捷回复已存在']);
+                        return json(['code' => -1, 'data' => url('words/index'), 'msg' => 'excel表第'.($i+2).'行快捷回复已存在']);
                     }
                 }
             }