Merge branch 'master' of github.com:metersphere/metersphere

This commit is contained in:
wangzhen-fit2cloud 2020-08-04 17:02:17 +08:00
commit ebba3937c7
1 changed files with 11 additions and 2 deletions

View File

@ -392,11 +392,20 @@ public class TestCaseService {
} else if (t.getMethod().equals("auto") && t.getType().equals("api")) { } else if (t.getMethod().equals("auto") && t.getType().equals("api")) {
data.setStepDesc(""); data.setStepDesc("");
data.setStepResult(""); data.setStepResult("");
data.setRemark(t.getApiName()); if(t.getTestId().equals("other")){
data.setRemark(t.getOtherTestName());
}else{
data.setRemark(t.getApiName());
}
} else if (t.getMethod().equals("auto") && t.getType().equals("performance")) { } else if (t.getMethod().equals("auto") && t.getType().equals("performance")) {
data.setStepDesc(""); data.setStepDesc("");
data.setStepResult(""); data.setStepResult("");
data.setRemark(t.getPerformName()); if(t.getTestId().equals("other")){
data.setRemark(t.getOtherTestName());
}else{
data.setRemark(t.getPerformName());
}
} }
data.setMaintainer(t.getMaintainer()); data.setMaintainer(t.getMaintainer());
list.add(data); list.add(data);