diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java index 34c12a0ae9..386e85e8c9 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java @@ -181,17 +181,10 @@ public class FunctionalCaseService { //获取附件信息 functionalCaseAttachmentService.getAttachmentInfo(functionalCaseDetailDTO); - handData(functionalCaseDetailDTO); - - return functionalCaseDetailDTO; } - private void handData(FunctionalCaseDetailDTO functionalCaseDetailDTO) { - FunctionalCaseModule caseModule = functionalCaseModuleMapper.selectByPrimaryKey(functionalCaseDetailDTO.getModuleId()); - functionalCaseDetailDTO.setModuleName(caseModule.getName()); - } private Boolean checkIsFollowCase(String caseId, String userId) { FunctionalCaseFollowerExample example = new FunctionalCaseFollowerExample(); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java index a2719ecd07..21b47c463f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java @@ -27,4 +27,7 @@ public class TemplateCustomFieldDTO { @Schema(title = "选项值") private List options; + @Schema(title = "字段类型") + private String type; + } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java index b4e24890d2..3a2dfdb250 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java @@ -119,6 +119,7 @@ public class BaseTemplateService { TemplateCustomFieldDTO templateCustomFieldDTO = new TemplateCustomFieldDTO(); BeanUtils.copyBean(templateCustomFieldDTO, i); templateCustomFieldDTO.setFieldName(customField.getName()); + templateCustomFieldDTO.setType(customField.getType()); AbstractCustomFieldResolver customFieldResolver = CustomFieldResolverFactory.getResolver(customField.getType()); Object defaultValue = null; try {