From b27d06b8f0b805efd16e28fd80a57a0ed8a053ce Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:31:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java | 28 ++++++++++++++++++++--------
1 files changed, 20 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 ea863bf..859dabc 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
@@ -2,6 +2,8 @@
import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
+import com.zt.core.context.User;
+import com.zt.core.context.UserContext;
import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.baselineRelease.dao.BaselineReleaseDao;
@@ -18,6 +20,7 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,6 +69,9 @@
@Autowired
private BaselineReleaseRemarkService remarkService;
+ @Autowired
+ private SysOssService sysOssService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -73,9 +79,15 @@
* @return
*/
public List<BaselineRelease> page(QueryFilter queryFilter) {
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ Long deptId = user.getDeptId();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
+ queryFilter.getQueryParams().put("deptId",deptId);
List<BaselineRelease> list = baseDao.getList(queryFilter.getQueryParams());
if (list.size() > 0) {
workflowService.getRunFlow(list, "jxfb");
+ sysOssService.setListOsses(list, "baseline_release");
}
return list;
}
@@ -96,7 +108,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);
@@ -107,18 +119,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