diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
index bfc6f77..316f7df 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java
@@ -112,16 +112,35 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
             query.like("project_name", projectEntrust.getProjectName());
         }
 
+        String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode();
+
+        //采购经理查 采购经理
+        if("ebtp-purchase".equals(currentRoleCode)){
+                query.eq("purchasing_manager", cacheUserService.getCacheUser().getUserId());
+        }
+        //代理管理员查 代理机构
+        if("ebtp-agency-admin".equals(currentRoleCode)){
+                query.eq("agency_company", cacheUserService.getCacheUser().getOrganizationId());
+        }
+        //代理机构业务经理 查 项目经理
+        if("ebtp-agency-project-manager ".equals(currentRoleCode)){
+                query.eq("project_manager", cacheUserService.getCacheUser().getUserId());
+        }
+
         //项目经理
-        if(StringUtils.isNotBlank(projectEntrust.getProjectManager())){
-            query.eq("project_manager", projectEntrust.getProjectManager());
-        }
-
-        //代理机构
-        if(StringUtils.isNotBlank(projectEntrust.getAgencyCompany())){
-            query.eq("agency_company", projectEntrust.getAgencyCompany());
-        }
-
+//        if(StringUtils.isNotBlank(projectEntrust.getProjectManager())){
+//            query.eq("project_manager", projectEntrust.getProjectManager());
+//        }
+//
+//        //代理机构
+//        if(StringUtils.isNotBlank(projectEntrust.getAgencyCompany())){
+//            query.eq("agency_company", projectEntrust.getAgencyCompany());
+//        }
+//
+//        //采购经理
+//        if(StringUtils.isNotBlank(projectEntrust.getPurchasingManager())){
+//            query.eq("purchasing_manager", projectEntrust.getPurchasingManager());
+//        }
         //采购方式
         if(StringUtils.isNotBlank(projectEntrust.getProcurementMode())){
             query.eq("procurement_mode", projectEntrust.getProcurementMode());
@@ -142,10 +161,6 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
             query.eq("procurement_plan_id", projectEntrust.getProcurementPlanId());
         }
 
-        //采购经理
-        if(StringUtils.isNotBlank(projectEntrust.getPurchasingManager())){
-            query.eq("purchasing_manager", projectEntrust.getPurchasingManager());
-        }
 
         return query;
     }