From aac230b48ee7a70a14ce94a2be2f6924995af629 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Tue, 28 Mar 2023 14:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=97=E9=80=8F=E6=A3=80=E6=B5=8B-=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=BD=93=E5=89=8D=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectEntrustServiceImpl.java       | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

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;
     }