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:
song-cc-rock 2022-11-17 14:20:05 +08:00
parent 202e85f23f
commit d2d6d2b89a
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
project-management/backend/src/main/java/io/metersphere/service/IssueTemplateService.java
View File

@ -370,7 +370,8 @@ public class IssueTemplateService extends TemplateBaseService {
.filter(item -> StringUtils.equals(item.getId(), sourceCustomFieldTemplate.getFieldId())) .filter(item -> StringUtils.equals(item.getId(), sourceCustomFieldTemplate.getFieldId()))
.collect(Collectors.toList()).get(0); .collect(Collectors.toList()).get(0);
CustomFieldExample example = new CustomFieldExample(); CustomFieldExample example = new CustomFieldExample();
example.createCriteria().andNameEqualTo(sourceCustomField.getName()).andSystemEqualTo(sourceCustomField.getSystem()) example.createCriteria().andNameEqualTo(sourceCustomField.getName())
.andSceneEqualTo(sourceCustomField.getScene()).andSystemEqualTo(sourceCustomField.getSystem())
.andProjectIdEqualTo(targetProjectId); .andProjectIdEqualTo(targetProjectId);
List<CustomField> targetCustomFields = customFieldMapper.selectByExample(example); List<CustomField> targetCustomFields = customFieldMapper.selectByExample(example);
if (CollectionUtils.isEmpty(targetCustomFields)) { if (CollectionUtils.isEmpty(targetCustomFields)) {
@ -383,6 +384,22 @@ public class IssueTemplateService extends TemplateBaseService {
tarCustomField.setCreateUser(SessionUtils.getUserId()); tarCustomField.setCreateUser(SessionUtils.getUserId());
tarCustomField.setProjectId(targetProjectId); tarCustomField.setProjectId(targetProjectId);
customFieldRecords.add(tarCustomField); customFieldRecords.add(tarCustomField);
if (sourceCustomField.getSystem()) {
// 系统字段未查到, 则为全局模板Gloal字段
CustomFieldExample customFieldExample = new CustomFieldExample();
customFieldExample.createCriteria().andNameEqualTo(sourceCustomField.getName())
.andSceneEqualTo(sourceCustomField.getScene()).andSystemEqualTo(sourceCustomField.getSystem())
.andProjectIdEqualTo("global");
List<CustomField> customFields = customFieldMapper.selectByExample(customFieldExample);
CustomFieldDao customFieldDao = new CustomFieldDao();
BeanUtils.copyBean(customFieldDao, tarCustomField);
if (CollectionUtils.isNotEmpty(customFields)) {
customFieldDao.setOriginGlobalId(customFields.get(0).getId());
}
// 新增系统字段, 需处理默认模板
handleSystemFieldCreate(customFieldDao);
}
} else { } else {
// 否则按照复制模式进行设置 // 否则按照复制模式进行设置
BeanUtils.copyBean(tarCustomField, targetCustomFields.get(0)); BeanUtils.copyBean(tarCustomField, targetCustomFields.get(0));