Merge branch 'sprint/renying_Fixbug#21999' into 'master'

Sprint/renying fixbug#21999

See merge request easycorp/zentaopms!3215

module/testcase/lang/zh-cn.php

@@ -223,6 +223,7 @@ $lang->testcase->buttonToList = '返回';
 $lang->testcase->errorEncode      = '无数据，请选择正确的编码重新上传！';
 $lang->testcase->noFunction       = '不存在iconv和mb_convert_encoding转码方法，不能将数据转成想要的编码！';
 $lang->testcase->noRequire        = "%s行的“%s”是必填字段，不能为空";
+$lang->testcase->noRequireTip     = "“%s”是必填字段，不能为空";
 $lang->testcase->noLibrary        = "现在还没有用例库，请先创建！";
 $lang->testcase->mustChooseResult = '必须选择评审结果';
 $lang->testcase->noModule         = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';

module/testcase/model.php

@@ -1210,8 +1210,9 @@ class testcaseModel extends model
         }
         $storyVersionPairs = $this->story->getVersions($data->story);
 
-        $cases = array();
-        $line  = 1;
+        $cases      = array();
+        $line       = 1;
+        $fieldNames = array();
         foreach($data->product as $key => $product)
         {
             $caseData = new stdclass();
@@ -1235,7 +1236,7 @@ class testcaseModel extends model
                 {
                     $requiredField = trim($requiredField);
                     if(!isset($caseData->$requiredField)) continue;
-                    if(empty($caseData->$requiredField)) dao::$errors[] = sprintf($this->lang->testcase->noRequire, $line, $this->lang->testcase->$requiredField);
+                    if(empty($caseData->$requiredField) and !isset($fieldNames[$requiredField])) $fieldNames[$requiredField] = $this->lang->testcase->$requiredField;
                 }
             }
 
@@ -1252,6 +1253,8 @@ class testcaseModel extends model
             $cases[$key] = $caseData;
             $line++;
         }
+        if(!empty($fieldNames)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $fieldNames));
+
         if(dao::isError()) return false;
 
         $forceNotReview = $this->forceNotReview();