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

fix: 修复合并代码时的问题

This commit is contained in:
Captain.B 2021-04-27 17:25:50 +08:00 committed by 刘瑞斌
parent 219c82c371
commit 29d4e4ebe1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ public class ApiDefinitionService {
@Resource
ApiModuleMapper apiModuleMapper;
@Resource
private SystemParameterService systemParameterService ;
private SystemParameterService systemParameterService;
private static Cache cache = Cache.newHardMemoryCache(0, 3600 * 24);
@ -116,7 +116,7 @@ public class ApiDefinitionService {
ServiceUtils.getSelectAllIds(request, request.getCondition(),
(query) -> extApiDefinitionMapper.selectIds(query));
List<ApiDefinitionResult> resList = extApiDefinitionMapper.listByIds(request.getIds());
calculateResult(resList);
calculateResult(resList, request.getProjectId());
return resList;
}
@ -366,7 +366,7 @@ public class ApiDefinitionService {
BeanUtils.copyBean(saveReq, apiDefinition);
apiDefinition.setCreateTime(System.currentTimeMillis());
apiDefinition.setUpdateTime(System.currentTimeMillis());
if(StringUtils.isEmpty(apiDefinition.getStatus())) {
if (StringUtils.isEmpty(apiDefinition.getStatus())) {
apiDefinition.setStatus(APITestStatus.Underway.name());
}
if (apiDefinition.getUserId() == null) {