diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index 7cf8f9d4c..87312065f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -55,6 +55,7 @@ import com.jero.modules.system.enums.SysCategoryValueTypeEnum;
 import com.jero.modules.system.mapper.SysCategoryMapper;
 import com.jero.modules.system.mapper.SysRoleMapper;
 import com.jero.modules.system.mapper.SysUserMapper;
+import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
 import com.jero.modules.system.service.ISysCategoryService;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysUserService;
@@ -143,6 +144,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 	private IProjectCertificationInventoryLogEOService projectCertificationInventoryLogEOService;
 	@Autowired
 	private IProjectCertificationInventoryEOService projectCertificationInventoryEOService;
+	@Autowired
+	private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
 
 	@Autowired
 	private BussDocumentLibraryEOMapper bussDocumentLibraryEOMapper;
@@ -1443,12 +1446,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					sysRoles.addAll(admin);
 				}
 				if (Viewer.size() != 0) {
-					Viewer.get(0).setRoleCode(ProjectRoleEnum.VIEWER.getCode());
+					Viewer.get(0).setRoleCode(ProjectRoleEnum.VIEWER.getValue());
 					Viewer.get(0).setRoleName(ProjectRoleEnum.VIEWER.getCode());
 					sysRoles.addAll(Viewer);
 				}
 				if (brandAdministrator.size() != 0) {
-					brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode());
+					brandAdministrator.get(0).setRoleCode(ProjectRoleEnum.BRAND_ADMINISTRATOR.getValue());
 					brandAdministrator.get(0).setRoleName(ProjectRoleEnum.BRAND_ADMINISTRATOR.getCode());
 					sysRoles.addAll(brandAdministrator);
 				}
@@ -1522,6 +1525,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				}
 			});
 		}
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = Integer.parseInt(roleCode);
+		if (isProjectRole == Integer.parseInt(com.jero.modules.project.enums.ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
+			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
+				queryWrapper.and(query -> {
+					for (String duty : dutyTerritoryList) {
+						query.or(q -> {
+							q.like("duty_territory", duty);
+						});
+					}
+				});
+			}
+		}
 		IPage<ProjectCertificationInventoryEO> pageList = this.page(page, queryWrapper);
 		this.disposeData(pageList.getRecords(),cut);
 		List<ProjectCertificationInventoryEO> records = this.hearSort(projectCertificationInventoryEO, pageList.getRecords());
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 36718defb..34093c51e 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
@@ -11366,7 +11366,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					sysRoles.addAll(admin);
 				}
 				if (Viewer.size() != 0) {
-					Viewer.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getCode());
+					Viewer.get(0).setRoleCode(com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getValue());
 					Viewer.get(0).setRoleName(com.jero.modules.system.enums.ProjectRoleEnum.VIEWER.getCode());
 					sysRoles.addAll(Viewer);
 				}
@@ -13584,6 +13584,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				}
 			});
 		}
+
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
+			//查当前用户Viewer对应责任领域
+			List<String> dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
+			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
+				queryWrapper.and(query -> {
+					for (String duty : dutyTerritoryList) {
+						query.or(q -> {
+							q.like("duty_territory", duty);
+						});
+					}
+				});
+			}
+		}
 		if (StringUtils.isNotEmpty(designFlowStatusStr)) {
 			String finalDesignFlowStatusStr = designFlowStatusStr.replaceAll("\\*","");
 			queryWrapper.and(query -> {
@@ -13613,8 +13629,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			});
 		}
 
-		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		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())
@@ -13626,15 +13640,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		Page<ProjectLawsInventoryEO> page = new Page<ProjectLawsInventoryEO>(pageNo, pageSize);
 		IPage<ProjectLawsInventoryEO> pageList = this.page(page, queryWrapper);
 		List<ProjectLawsInventoryEO> result = pageList.getRecords();
-		if (isProjectRole == Integer.parseInt(ProjectRoleEnum.VIEWER.getValue())) {
-			//查当前用户Viewer对应责任领域
-			List<String> dutyTerritoryList = this.projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
-			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
-				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
-			} else {
-				result = new ArrayList<>();
-			}
-		}
+
 		this.dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut());
 		this.dataDictDispose(result,projectLawsInventoryEO.getCut());
 		//表头排序