From e69eb0a9457c26df83932180f5803686e3bc4310 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 17 Apr 2023 16:33:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=AE=A1=20debug=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java    | 3 +++
 .../com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java  | 2 ++
 .../java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java
index 06bb9f9..4234cd0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java
@@ -299,6 +299,9 @@ public class ProjectDraft implements Serializable {
     @ApiModelProperty("用户id")
     private String userId;
 
+    @ApiModelProperty("项目申报书")
+    private String projectApplicationForm;
+
     private Long createBy;
     private Long updateBy;
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
index 848151c..2727ff0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java
@@ -303,6 +303,8 @@ public class ProjectDraftVO implements Serializable {
     @ApiModelProperty("21位项目编号")
     private String projectCode;
 
+    @ApiModelProperty("项目申报书")
+    private String projectApplicationForm;
 
     private Long createBy;
     private Long updateBy;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java
index 8de53b9..369349d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java
@@ -51,6 +51,7 @@ public class WorkbenchManage {
 
     public WorkbenchVO getWorkbenchData(Integer year){
         WorkbenchVO res = new WorkbenchVO();
+        UserInfoDetails user = LoginUserUtil.loginUserDetail();
 
         //1.待办中心数据
         TodoCenterStatisticsVO statisticsVO = todoCenterManage.todoCenterStatistics();
@@ -70,6 +71,7 @@ public class WorkbenchManage {
         projectListReq.setPageNumber(1);
         projectListReq.setPageSize(5);
         projectListReq.setProjectYear(year);
+        projectListReq.setBuildOrgCode(user.getEmpPosUnitCode());
         res.setProjects(projectLibManage.projectLibListWithPermission(projectListReq).getRecords().stream().collect(Collectors.toList()));
 
         //3.所有公告按类型分