diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java
index dacc602..61a5baa 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java
@@ -19,6 +19,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.Inq
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +34,7 @@ import java.util.List;
  * @date 2029/10/23
  * @version 1.0
  */
+@Slf4j
 @RestController
 @Api(tags = "项目委托表")
 @RequestMapping("/v1/projectEntrust")
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..ad96404 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();
+        log.info("查询分页数据 currentRoleCode2:"+currentRoleCode);
+        //String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode();
+
+        //采购经理查 采购经理
+        if("ebtp-purchase".equals(currentRoleCode)){
+                query.eq("purchasing_manager", cacheUserService.getCacheUser().getUserId());
+        }else if("ebtp-agency-admin".equals(currentRoleCode)){ //代理管理员查 代理机构
+                query.eq("agency_company", cacheUserService.getCacheUser().getOrganizationId());
+        }else if("ebtp-agency-project-manager".equals(currentRoleCode)){//代理机构业务经理 查 项目经理
+                query.eq("project_manager", cacheUserService.getCacheUser().getUserId());
+        }else{
+            query.eq("1", "2");
+        }
+
         //项目经理
-        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;
     }