From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java | 23 +++++++++++++++--------
1 files changed, 15 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..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;
@@ -77,6 +79,11 @@
* @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");
@@ -101,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);
@@ -112,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