From d99b897011b3d0c2e96b7fa8d21255effe4317f7 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期一, 20 十一月 2023 15:15:46 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java | 2 +- modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 4 ++-- modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java index d048a09..5c361eb 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java @@ -71,8 +71,8 @@ @ApiOperation("淇℃伅") public Result<SoftwareTestOrderDto> getDto(Long environId, Long projectId) { SoftwareTestOrderDto data = environService.getDto(environId, projectId); - if (projectId != null) { - OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ"); + if (environId != null) { + OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram"); if (ossDto != null) { data.setFiles(ossDto); } diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java index 527ef61..54a25af 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java @@ -23,7 +23,7 @@ private Environ environ; @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅") private TestAgencyInfo TestAgencyInfo; - @ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曢檮浠�") + @ApiModelProperty(value = "闄勪欢") private OssDto files; @ApiModelProperty(value = "琚祴浠�") diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java index 9b9fb1a..7c835b6 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java +++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java @@ -152,7 +152,7 @@ } else { testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo()); } - sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢 + sysOssConfigService.updateOss(softwareTestOrderDto.getEnviron().getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢 return true; } } -- Gitblit v1.9.1