diff --git a/web-adapter/src/main/java/com/zcloud/domain/web/DomainDepartmentController.java b/web-adapter/src/main/java/com/zcloud/domain/web/DomainDepartmentController.java index 56a4d51..0d399ab 100644 --- a/web-adapter/src/main/java/com/zcloud/domain/web/DomainDepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/domain/web/DomainDepartmentController.java @@ -44,7 +44,7 @@ public class DomainDepartmentController { @ApiOperation("分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('lybmgl')") + @PreAuthorize("@pms.hasAnyPermission('lybmgl')") public PageResponse page(@RequestBody DomainDepartmentPageQry qry) { return domainDepartmentService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/domain/web/DomainGroupController.java b/web-adapter/src/main/java/com/zcloud/domain/web/DomainGroupController.java index a003326..ac1f2f7 100644 --- a/web-adapter/src/main/java/com/zcloud/domain/web/DomainGroupController.java +++ b/web-adapter/src/main/java/com/zcloud/domain/web/DomainGroupController.java @@ -50,7 +50,7 @@ public class DomainGroupController { @ApiOperation("领域组分页") @PostMapping("/list") -// @PreAuthorize("@pms.hasAnyPermission('lyzgl')") + @PreAuthorize("@pms.hasAnyPermission('lyzgl')") public PageResponse page(@RequestBody DomainGroupPageQry qry) { return domainGroupService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/domain/web/ProjectTaskController.java b/web-adapter/src/main/java/com/zcloud/domain/web/ProjectTaskController.java index 39597ac..e4cb4a8 100644 --- a/web-adapter/src/main/java/com/zcloud/domain/web/ProjectTaskController.java +++ b/web-adapter/src/main/java/com/zcloud/domain/web/ProjectTaskController.java @@ -43,14 +43,14 @@ public class ProjectTaskController { @ApiOperation("课题任务分页") @PostMapping("/projectPage") -// @PreAuthorize("@pms.hasAnyPermission('gfd-ktrw','qyd-ktrw')") + @PreAuthorize("@pms.hasAnyPermission('gfd-ktrw','qyd-ktrw')") public PageResponse listPage(@RequestBody ProjectTaskPageQry qry) { return projectTaskService.listPage(qry); } @ApiOperation("课题评分分页") @PostMapping("/projectScorepage") -// @PreAuthorize("@pms.hasAnyPermission('gfd-ktpf','qyd-ktpf')") + @PreAuthorize("@pms.hasAnyPermission('gfd-ktpf','qyd-ktpf')") public PageResponse projectScorepage(@RequestBody ProjectTaskPageQry qry) { return projectTaskService.listPage(qry); } diff --git a/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml b/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml index 12bfff8..5c8a43b 100644 --- a/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/ProjectTaskMapper.xml @@ -11,6 +11,8 @@ on pt.domain_department_id = dd.domain_department_id and dd.delete_enum = 'false' left join corp_info c on c.id = pt.execute_corpinfo_id left join department d on d.id = dd.master_department_id + left join project_task_score_info ptsi on ptsi.project_task_id = pt.project_task_id + left join project_task_group_user pti on pti.project_task_id = pt.project_task_id where pt.delete_enum = 'false' and pt.domain_type = #{params.domainType}