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

fix(用例管理): 修复用例脑图保存更新时清空用例标签问题 

--bug=1046188 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046188
This commit is contained in:
guoyuqi 2024-09-13 19:10:22 +08:00 committed by Craftsman
parent 433bb5085a
commit 0c8b408bcb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
View File

@ -372,7 +372,7 @@ public class FunctionalCaseMinderService {
List<FunctionalCase> allChildrenCaseInDB = new ArrayList<>(); List<FunctionalCase> allChildrenCaseInDB = new ArrayList<>();
if (CollectionUtils.isNotEmpty(targetCaseParentIdsNoRepeat)) { if (CollectionUtils.isNotEmpty(targetCaseParentIdsNoRepeat)) {
functionalCaseExample = new FunctionalCaseExample(); functionalCaseExample = new FunctionalCaseExample();
functionalCaseExample.createCriteria().andModuleIdIn(targetCaseParentIdsNoRepeat); functionalCaseExample.createCriteria().andModuleIdIn(targetCaseParentIdsNoRepeat).andProjectIdEqualTo(request.getProjectId());
allChildrenCaseInDB = functionalCaseMapper.selectByExample(functionalCaseExample); allChildrenCaseInDB = functionalCaseMapper.selectByExample(functionalCaseExample);
} }
@ -381,14 +381,14 @@ public class FunctionalCaseMinderService {
List<FunctionalCaseModule> allChildrenByCaseInDB = new ArrayList<>(); List<FunctionalCaseModule> allChildrenByCaseInDB = new ArrayList<>();
if (CollectionUtils.isNotEmpty(caseModuleIds)) { if (CollectionUtils.isNotEmpty(caseModuleIds)) {
functionalCaseModuleExample = new FunctionalCaseModuleExample(); functionalCaseModuleExample = new FunctionalCaseModuleExample();
functionalCaseModuleExample.createCriteria().andParentIdIn(caseModuleIds); functionalCaseModuleExample.createCriteria().andParentIdIn(caseModuleIds).andProjectIdEqualTo(request.getProjectId());;
allChildrenByCaseInDB = moduleMapper.selectByExample(functionalCaseModuleExample); allChildrenByCaseInDB = moduleMapper.selectByExample(functionalCaseModuleExample);
} }
allChildrenInDB.addAll(allChildrenByCaseInDB); allChildrenInDB.addAll(allChildrenByCaseInDB);
MindAdditionalNodeExample mindAdditionalNodeExample = new MindAdditionalNodeExample(); MindAdditionalNodeExample mindAdditionalNodeExample = new MindAdditionalNodeExample();
mindAdditionalNodeExample.createCriteria().andIdIn(targetIds); mindAdditionalNodeExample.createCriteria().andIdIn(targetIds).andProjectIdEqualTo(request.getProjectId());;
List<MindAdditionalNode> mindAdditionalNodes = additionalNodeMapper.selectByExample(mindAdditionalNodeExample); List<MindAdditionalNode> mindAdditionalNodes = additionalNodeMapper.selectByExample(mindAdditionalNodeExample);
Map<String, String> targetTextMap = new HashMap<>(); Map<String, String> targetTextMap = new HashMap<>();
List<String> targetTextParentIds = new ArrayList<>(); List<String> targetTextParentIds = new ArrayList<>();
@ -423,7 +423,7 @@ public class FunctionalCaseMinderService {
if (CollectionUtils.isNotEmpty(textModuleFilterCaseIds)) { if (CollectionUtils.isNotEmpty(textModuleFilterCaseIds)) {
functionalCaseExample = new FunctionalCaseExample(); functionalCaseExample = new FunctionalCaseExample();
functionalCaseExample.createCriteria().andModuleIdIn(textModuleFilterCaseIds); functionalCaseExample.createCriteria().andModuleIdIn(textModuleFilterCaseIds).andProjectIdEqualTo(request.getProjectId());;
List<FunctionalCase> allChildrenCaseByTextInDB = functionalCaseMapper.selectByExample(functionalCaseExample); List<FunctionalCase> allChildrenCaseByTextInDB = functionalCaseMapper.selectByExample(functionalCaseExample);
allChildrenCaseInDB.addAll(allChildrenCaseByTextInDB); allChildrenCaseInDB.addAll(allChildrenCaseByTextInDB);
} }
@ -659,6 +659,7 @@ public class FunctionalCaseMinderService {
List<FunctionalCase> oldCase = functionalCaseMapper.selectByExample(functionalCaseExample); List<FunctionalCase> oldCase = functionalCaseMapper.selectByExample(functionalCaseExample);
Map<String, FunctionalCase> oldCaseMap = oldCase.stream().collect(Collectors.toMap(FunctionalCase::getId, t -> t)); Map<String, FunctionalCase> oldCaseMap = oldCase.stream().collect(Collectors.toMap(FunctionalCase::getId, t -> t));
FunctionalCaseBlobExample functionalCaseBlobExample = new FunctionalCaseBlobExample(); FunctionalCaseBlobExample functionalCaseBlobExample = new FunctionalCaseBlobExample();
functionalCaseBlobExample.createCriteria().andIdIn(caseIds);
List<FunctionalCaseBlob> functionalCaseBlobs = functionalCaseBlobMapper.selectByExample(functionalCaseBlobExample); List<FunctionalCaseBlob> functionalCaseBlobs = functionalCaseBlobMapper.selectByExample(functionalCaseBlobExample);
Map<String, FunctionalCaseBlob> oldBlobMap = functionalCaseBlobs.stream().collect(Collectors.toMap(FunctionalCaseBlob::getId, t -> t)); Map<String, FunctionalCaseBlob> oldBlobMap = functionalCaseBlobs.stream().collect(Collectors.toMap(FunctionalCaseBlob::getId, t -> t));
@ -1035,6 +1036,7 @@ public class FunctionalCaseMinderService {
functionalCase.setUpdateTime(System.currentTimeMillis()); functionalCase.setUpdateTime(System.currentTimeMillis());
functionalCase.setCreateUser(null); functionalCase.setCreateUser(null);
functionalCase.setCreateTime(null); functionalCase.setCreateTime(null);
functionalCase.setTags(null);
//更新用例 //更新用例
caseMapper.updateByPrimaryKeySelective(functionalCase); caseMapper.updateByPrimaryKeySelective(functionalCase);
return caseMapper.selectByPrimaryKey(functionalCase.getId()); return caseMapper.selectByPrimaryKey(functionalCase.getId());