项目库 预审申报项目 可被提交

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);
     }

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