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 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 page = projectService.page(req.page(), query); long total; if ((total = page.getTotal()) == 0) {