diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 2effaaaf2..ea558e7ca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -3966,6 +3966,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, request.getParameterMap()); queryWrapper.in("project_library_id", projectLawsInventoryEO.getProjectLibraryId()); @@ -3977,13 +3978,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { q.eq("regulation_owner_id", currentUser.getId()). or().eq("homologation_engineer_id", currentUser.getId()); }); } + if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) { + //查当前用户Viewer对应责任领域 + List dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId()); + if (ObjectUtils.isNotEmpty(dutyTerritoryList)) { + queryWrapper.in("duty_territory", dutyTerritoryList); + } + } //导出的数据 dataList = this.list(queryWrapper); @@ -4009,7 +4017,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl