From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java
index 868f5ea..a26142e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java
@@ -101,7 +101,7 @@
data.setId(baselineId);
BaselineRelease baseline = this.get(baselineId);
data.setBaseline(baseline);
- if (projectId == null) {
+ if (baseline != null && projectId == null) {
projectId = baseline.getProjectId();
}
List<BaselineReleaseRemark> remarkList = remarkService.getList(baselineId);
@@ -112,18 +112,18 @@
baseline.setPageCode(pageCode);
data.setBaseline(baseline);
}
- if ("demand".equals(pageCode)){
+ if ("demand".equals(pageCode)) {
data.getBaseline().setBaselineType("1");
- }else if("product".equals(pageCode)){
+ } else if ("product".equals(pageCode)) {
data.getBaseline().setBaselineType("2");
}
for (BaselineReleaseRemark remark : data.getRemarkList()) {
if (remark.getWarehouseDetailId() != null) {
- Long configItemId = remark.getWarehouseDetailId();
- OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
- if (ossDto != null) {
- remark.setFiles(ossDto);
- }
+ Long configItemId = remark.getWarehouseDetailId();
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
+ if (ossDto != null) {
+ remark.setFiles(ossDto);
+ }
}
}
if (projectId != null) {
--
Gitblit v1.9.1