diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index baf678fb..5f9e3c79 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -174,67 +174,74 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		 	return Result.error("没有查到用户信息！");
 		 }
 		 List<String> listProjectIds = new ArrayList<>();
-		 // 项目的企业联系人
-		 LambdaQueryWrapper<PayCommonProject> queryPayCommonProject = new LambdaQueryWrapper<>();
-		 queryPayCommonProject.eq(PayCommonProject::getContactsId,sysUser.getId()).or()
-				 .eq(PayCommonProject::getMailContactsId,sysUser.getId());
-		 List<PayCommonProject> listPayCommonProject = payCommonProjectService.list(queryPayCommonProject);
-		 if(!CollectionUtils.isEmpty(listPayCommonProject)){
-			List<String> list = listPayCommonProject.stream().map(PayCommonProject::getId).collect(Collectors.toList());
-			 listProjectIds.addAll(list);
-		 }
-		 // 邮寄联系人
-		 LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
-		 queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
-		 List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
-		 if(!CollectionUtils.isEmpty(listPayMailBill)){
-			 List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
-			 LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-			 queryPayMailBillProject.in(PayMailBillProject::getBillId,listId);
-			 List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
-			 if(!CollectionUtils.isEmpty(listPayMailBillProject)){
-				 List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
-				 listProjectIds.addAll(listProjectId);
-			 }
-		 }
-		 // 打包的企业联系人和打包联系人
-		 LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
-		 queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or()
-				 .eq(PayPackCompany::getPackContactId,sysUser.getId());
-		 List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
-		 if(!CollectionUtils.isEmpty(listPayPackCompany)){
-		 	List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
-		 	LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
-			 queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
-			 queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1);
-			 List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
-			 if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
-			 	List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
-				 listProjectIds.addAll(listId);
-			 }
-		 }
-		 // 关联合同的签订单位联系人
-		 LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
-		 queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId());
-		 List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
-		 if(!CollectionUtils.isEmpty(listPayIncomeContract)){
-			List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
-			LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
-			 queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
-			 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
-			 List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
-			 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
-			 	List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
-				 listProjectIds.addAll(listProjectId);
-			 }
-		 }
 		 QueryWrapper<PayCommonProject> queryWrapper = QueryGenerator.initQueryWrapper(payCommonProject, req.getParameterMap());
-		 if(!CollectionUtils.isEmpty(listProjectIds)){
-			 List<String> listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
-			 queryWrapper.in("id",listProjectIdsNew);
+
+		 //企业管理员-查询全公司
+		 if (sysUser.getIsCompanyManager()) {
+			 queryWrapper.eq("charge_company_id",sysUser.getCompanyId());
 		 }else{
-			 queryWrapper.in("id", Arrays.asList(""));
+			 // 项目的企业联系人
+			 LambdaQueryWrapper<PayCommonProject> queryPayCommonProject = new LambdaQueryWrapper<>();
+			 queryPayCommonProject.eq(PayCommonProject::getContactsId,sysUser.getId()).or()
+					 .eq(PayCommonProject::getMailContactsId,sysUser.getId());
+			 List<PayCommonProject> listPayCommonProject = payCommonProjectService.list(queryPayCommonProject);
+			 if(!CollectionUtils.isEmpty(listPayCommonProject)){
+				 List<String> list = listPayCommonProject.stream().map(PayCommonProject::getId).collect(Collectors.toList());
+				 listProjectIds.addAll(list);
+			 }
+			 // 邮寄联系人
+			 LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
+			 queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
+			 List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);
+			 if(!CollectionUtils.isEmpty(listPayMailBill)){
+				 List<String> listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList());
+				 LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
+				 queryPayMailBillProject.in(PayMailBillProject::getBillId,listId);
+				 List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
+				 if(!CollectionUtils.isEmpty(listPayMailBillProject)){
+					 List<String> listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList());
+					 listProjectIds.addAll(listProjectId);
+				 }
+			 }
+			 // 打包的企业联系人和打包联系人
+			 LambdaQueryWrapper<PayPackCompany> queryPayPackCompany = new LambdaQueryWrapper<>();
+			 queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or()
+					 .eq(PayPackCompany::getPackContactId,sysUser.getId());
+			 List<PayPackCompany> listPayPackCompany = payPackCompanyService.list(queryPayPackCompany);
+			 if(!CollectionUtils.isEmpty(listPayPackCompany)){
+				 List<String> listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList());
+				 LambdaQueryWrapper<PayPackCompanyProject> queryPayPackCompanyProject = new LambdaQueryWrapper<>();
+				 queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId);
+				 queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType,PayProjectCommon.PROJECT_TYPE1);
+				 List<PayPackCompanyProject> listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject);
+				 if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){
+					 List<String> listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
+					 listProjectIds.addAll(listId);
+				 }
+			 }
+			 // 关联合同的签订单位联系人
+			 LambdaQueryWrapper<PayIncomeContract> queryPayIncomeContract = new LambdaQueryWrapper<>();
+			 queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId());
+			 List<PayIncomeContract> listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract);
+			 if(!CollectionUtils.isEmpty(listPayIncomeContract)){
+				 List<String> listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList());
+				 LambdaQueryWrapper<PayIncomeContractAssociated> queryPayIncomeContractAssociated = new LambdaQueryWrapper<>();
+				 queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId);
+				 queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE1);
+				 List<PayIncomeContractAssociated> listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated);
+				 if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){
+					 List<String> listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList());
+					 listProjectIds.addAll(listProjectId);
+				 }
+			 }
+			 if(!CollectionUtils.isEmpty(listProjectIds)){
+				 List<String> listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList());
+				 queryWrapper.in("id",listProjectIdsNew);
+			 }else{
+				 queryWrapper.in("id", Arrays.asList(""));
+			 }
 		 }
+
 		 if(!StringUtils.isEmpty(payCommonProject.getYear())){
 			 queryWrapper.eq("year",payCommonProject.getYear());
 		 }