diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 3d5ba5b49..b13b6f95c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -1832,7 +1832,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     public List<Map<String, Object>> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut, List<ProjectLibraryBase> plbEoList) {
         List<Map<String, Object>> result = new ArrayList<>();
         List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-        if (!plbEoList.isEmpty()) {
+        if (ObjectUtils.isNotEmpty(plbEoList)) {
             projectLibraryBaseList = plbEoList.stream().filter(e -> e.getId().equals(projectId)).collect(Collectors.toList());
         }
         List<OtaManageApplyEO> receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
index 0169059a1..412ed239c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
@@ -3955,16 +3955,16 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
 		}
 		queryWrapper.orderByDesc("create_time", "serial_number");
 
-		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();
-			queryWrapper.and(q -> {
-				q.eq("regulation_owner_id", currentUser.getId()).
-						or().eq("homologation_engineer_id", currentUser.getId());
-			});
-		}
+//		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();
+//			queryWrapper.and(q -> {
+//				q.eq("regulation_owner_id", currentUser.getId()).
+//						or().eq("homologation_engineer_id", currentUser.getId());
+//			});
+//		}
 		//导出的数据
 		dataList = this.list(queryWrapper);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 624172269..e7288fcd9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -1286,12 +1286,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 
 		//平台件项目对应的法规清单数据
 		LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper1 = new LambdaQueryWrapper<>();
-		wrapper1.in(ProjectLawsInventoryEO::getId,Arrays.asList(projectLibraryIds.split(",")));
+		wrapper1.in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(projectLibraryIds.split(",")));
 		List<ProjectLawsInventoryEO> lawsInventoryEOS = projectLawsInventoryEOService.list(wrapper1);
 
 		//平台件项目信息
 		List<ProjectLibraryBase> projectLibraryBaseList = new ArrayList<>();
-		if(!lawsInventoryEOList.isEmpty()){
+		if(!lawsInventoryEOList.isEmpty() && ObjectUtils.isNotEmpty(lawsInventoryEOS)){
 			List<String> projectIdList = lawsInventoryEOS.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList());
 			LambdaQueryWrapper<ProjectLibraryBase> wrapper2 = new LambdaQueryWrapper<>();
 			wrapper2.in(ProjectLibraryBase::getId,projectIdList);