修改

jinlin

2023-12-28 63447fec93e8e562833db30bc848884001b808c4

 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) {