modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
@@ -68,9 +68,9 @@ @GetMapping("getDto") @ApiOperation("信息") public Result<ConfigItemChangeDto> getDto(Long projectId, Long ChangeId) { ConfigItemChangeDto data = configItemChangeService.getDto(projectId, ChangeId); if (ChangeId!=null) { public Result<ConfigItemChangeDto> getDto(Long projectId, Long changeId) { ConfigItemChangeDto data = configItemChangeService.getDto(projectId, changeId); if (changeId!=null) { for (WarehouseConfigItem configItem : data.getConfigItemList()) { Long configItemId = configItem.getId(); OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse"); modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
@@ -161,21 +161,21 @@ return true; } public ConfigItemChangeDto getDto(Long projectId, Long warehouseId) { public ConfigItemChangeDto getDto(Long projectId, Long changeId) { ConfigItemChangeDto data = new ConfigItemChangeDto(); if (warehouseId != null) { data.setId(warehouseId); ConfigItemChange configItemChange = this.get(warehouseId); if (changeId != null) { data.setId(changeId); ConfigItemChange configItemChange = this.get(changeId); data.setConfigItemChange(configItemChange); if (projectId == null) { projectId = configItemChange.getProjectId(); } List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId); List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(changeId); data.setCmAuditList(CmAuditList); List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId); List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(changeId); data.setQaAuditList(QaAuditList); List<WarehouseConfigItem> ConfigItemList = configItemService.getList(warehouseId); List<WarehouseConfigItem> ConfigItemList = configItemService.getList(changeId); data.setConfigItemList(ConfigItemList); } else { web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -421,7 +421,7 @@ // 获取信息 async getInfo() { let params = { warehouseId: this.dataForm.id, changeId: this.dataForm.id, projectId: this.dataForm.projectId } let res = await this.$http.get(`/configItemChange/ConfigItemChange/getDto`, {params: params})