From c16279ec565f24afd7854e6b4fdef6298c93cfe1 Mon Sep 17 00:00:00 2001
From: gaosong <gao1532114>
Date: Wed, 27 Dec 2023 16:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9viewer=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=9D=83=E9=99=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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<ProjectLawsIn
 
 	@Override
 	public void exportData(HttpServletResponse response, HttpServletRequest request, ProjectLawsInventoryEO projectLawsInventoryEO) {
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		List<ProjectLawsInventoryEO> dataList = new ArrayList<>();
 		QueryWrapper<ProjectLawsInventoryEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO, request.getParameterMap());
 		queryWrapper.in("project_library_id", projectLawsInventoryEO.getProjectLibraryId());
@@ -3977,13 +3978,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
 		if (isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
 				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
-				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())) {
-			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
 			queryWrapper.and(q -> {
 				q.eq("regulation_owner_id", currentUser.getId()).
 						or().eq("homologation_engineer_id", currentUser.getId());
 			});
 		}
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> 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<ProjectLawsIn
 		//数据转换(文件名称,对应标准)
 		dataTransition(dataList, fileInfos, sysUserList, projectLawsInventoryEO);
 
-		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		this.dataDispose(dataList, currentUser, Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()), projectLawsInventoryEO.getCut());
 		OutputStream os = null;
 		try {