Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #3579.

Browse Source
This commit is contained in:
wangyidong
2018-01-04 17:28:51 +08:00
parent e35451994c
commit 607076205e
13 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+2 -2
View File
@@ -1333,7 +1333,7 @@ class testcase extends control
$columnKey[] = $fields[$title];
}
if(count($columnKey) != count($header) or $this->post->encode != 'utf-8')
if(count($columnKey) == 0 or $this->post->encode != 'utf-8')
{
$fc = file_get_contents($fileName);
$encode = $this->post->encode != "utf-8" ? $this->post->encode : 'gbk';
@@ -1354,7 +1354,7 @@ class testcase extends control
if(!isset($fields[$title])) continue;
$columnKey[] = $fields[$title];
}
if(count($columnKey) != count($header)) die(js::alert($this->lang->testcase->errorEncode));
if(count($columnKey) == 0) die(js::alert($this->lang->testcase->errorEncode));
}
$this->session->set('importFile', $fileName);