From 94eace592f2b0d085a30180acc572ebf110c95e4 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 28 Mar 2023 16:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=20=E9=A2=84?=
 =?UTF-8?q?=E5=AE=A1=E7=94=B3=E6=8A=A5=E9=A1=B9=E7=9B=AE=20=E5=8F=AF?=
 =?UTF-8?q?=E8=A2=AB=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectlib/controller/AnnualPlanController.java  | 2 +-
 .../com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
index 907372c..be316dd 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
@@ -35,7 +35,7 @@ public class AnnualPlanController {
     private final AnnualPlanLibManage annualPlanLibManage;
 
     @GetMapping("/list")
-    @ApiOperation("年段计划库列表")
+    @ApiOperation("年度计划库列表")
     public PageVo<AnnualPlanListItemVO> annualPlanLibList(ProjectListReq req) {
         return annualPlanLibManage.annulPlanLibList(req);
     }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
index f2ca34f..e10c4a5 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
@@ -57,6 +57,8 @@ public class AnnualPlanLibManage {
     private final IProjectService projectService;
     private final StateMachineUtils stateMachine;
 
+    private final ProjectLibManage projectLibManage;
+
     /**
      * 年度计划查询状态
      */
@@ -87,6 +89,8 @@ public class AnnualPlanLibManage {
         query.eq(Project::getIsTemporaryAugment, isTemporaryAugment);
         query.orderByDesc(Project::getAnnualPlanAddTime);
         query.in(Project::getStatus, CollUtils.fieldList(ANNUAL_PLAN_LIST_STATUS, ProjectStatusEnum::getCode));
+        //数据权限
+        projectLibManage.buildProjectLibPermission(query);
         Page<Project> page = projectService.page(req.page(), query);
         long total;
         if ((total = page.getTotal()) == 0) {