test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 生产自定义字段报空指针 (#4307) 

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
This commit is contained in:
metersphere-bot 2021-07-02 10:58:08 +08:00 committed by GitHub
parent 3537b54bdd
commit 02021c9476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -330,7 +330,7 @@ public class ApiAutomationService {
private int getNextNum(String projectId) { private int getNextNum(String projectId) {
ApiScenario apiScenario = extApiScenarioMapper.getNextNum(projectId); ApiScenario apiScenario = extApiScenarioMapper.getNextNum(projectId);
if (apiScenario == null) { if (apiScenario == null || apiScenario.getNum() == null) {
return 100001; return 100001;
} else { } else {
return Optional.of(apiScenario.getNum() + 1).orElse(100001); return Optional.of(apiScenario.getNum() + 1).orElse(100001);

2
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -361,7 +361,7 @@ public class ApiDefinitionService {
private int getNextNum(String projectId) { private int getNextNum(String projectId) {
ApiDefinition apiDefinition = extApiDefinitionMapper.getNextNum(projectId); ApiDefinition apiDefinition = extApiDefinitionMapper.getNextNum(projectId);
if (apiDefinition == null) { if (apiDefinition == null || apiDefinition.getNum() == null) {
return 100001; return 100001;
} else { } else {
return Optional.of(apiDefinition.getNum() + 1).orElse(100001); return Optional.of(apiDefinition.getNum() + 1).orElse(100001);

2
backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
View File

@ -64,7 +64,7 @@ public class HistoricalDataUpgradeService {
private int getNextNum(String projectId) { private int getNextNum(String projectId) {
ApiScenario apiScenario = extApiScenarioMapper.getNextNum(projectId); ApiScenario apiScenario = extApiScenarioMapper.getNextNum(projectId);
if (apiScenario == null) { if (apiScenario == null || apiScenario.getNum() == null) {
return 100001; return 100001;
} else { } else {
return Optional.of(apiScenario.getNum() + 1).orElse(100001); return Optional.of(apiScenario.getNum() + 1).orElse(100001);

2
backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
View File

@ -589,7 +589,7 @@ public class PerformanceTestService {
private int getNextNum(String projectId) { private int getNextNum(String projectId) {
LoadTest loadTest = extLoadTestMapper.getNextNum(projectId); LoadTest loadTest = extLoadTestMapper.getNextNum(projectId);
if (loadTest == null) { if (loadTest == null || loadTest.getNum() == null) {
return 100001; return 100001;
} else { } else {
return Optional.of(loadTest.getNum() + 1).orElse(100001); return Optional.of(loadTest.getNum() + 1).orElse(100001);

2
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
View File

@ -984,7 +984,7 @@ public class TestCaseService {
*/ */
private int getNextNum(String projectId) { private int getNextNum(String projectId) {
TestCase testCase = extTestCaseMapper.getMaxNumByProjectId(projectId); TestCase testCase = extTestCaseMapper.getMaxNumByProjectId(projectId);
if (testCase == null) { if (testCase == null || testCase.getNum() == null) {
return 100001; return 100001;
} else { } else {
return Optional.ofNullable(testCase.getNum() + 1).orElse(100001); return Optional.ofNullable(testCase.getNum() + 1).orElse(100001);