From 35c6fdc2825a7617d703b4b1e9a1ca0437608d65 Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Wed, 29 Mar 2023 09:48:45 +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=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=92=E8=89=B2=E7=BC=96=E5=8F=B7=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProjectEntrustController.java         |  6 ++----
 .../service/IProjectEntrustService.java              |  2 +-
 .../service/impl/ProjectEntrustServiceImpl.java      | 12 +++++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

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 affce51..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
@@ -104,11 +104,9 @@ public class ProjectEntrustController{
 	@ApiOperation("查询分页数据")
 	@PostMapping("/getPage")
 	@PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-sub-admin','ebtp-agency-admin','ebtp-agency-project-manager')")
-	public BaseResponse<IPage<ProjectEntrustVO>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust,
-														 @RequestHeader(name = "currentRoleCode", required = false) String currentRoleCode){
+	public BaseResponse<IPage<ProjectEntrustVO>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust){
 
-		log.info("查询分页数据 currentRoleCode:"+currentRoleCode);
-		return BaseResponse.success(projectEntrustService.getPage(projectEntrust,currentRoleCode));
+		return BaseResponse.success(projectEntrustService.getPage(projectEntrust));
 	}
 
 
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java
index 7c8b0e1..ed4b031 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/IProjectEntrustService.java
@@ -22,7 +22,7 @@ public interface IProjectEntrustService extends IBaseService<ProjectEntrust>{
      * @param projectEntrust 委托单查询信息
      * @return 返回结果
      */
-    IPage<ProjectEntrustVO> getPage(ProjectEntrustVO projectEntrust,String currentRoleCode);
+    IPage<ProjectEntrustVO> getPage(ProjectEntrustVO 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 d6a6a7e..eea70c0 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
@@ -105,13 +105,15 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
      * @param projectEntrust 查询条件
      * @return 返回查询条件
      */
-    private QueryWrapper<ProjectEntrust> getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust,String currentRoleCode) {
+    private QueryWrapper<ProjectEntrust> getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust) {
         QueryWrapper<ProjectEntrust> query = new QueryWrapper<>();
         //项目名称
         if(StringUtils.isNotBlank(projectEntrust.getProjectName())){
             query.like("project_name", projectEntrust.getProjectName());
         }
-        log.info("查询分页数据 currentRoleCode2:"+cacheUserService.getCacheUser().getCurrentRoleCode());
+
+        String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode();
+        log.info("查询分页数据 currentRoleCode2:"+currentRoleCode);
         //String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode();
 
         //采购经理查 采购经理
@@ -123,7 +125,7 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
                 query.eq("agency_company", cacheUserService.getCacheUser().getOrganizationId());
         }
         //代理机构业务经理 查 项目经理
-        if("ebtp-agency-project-manager ".equals(currentRoleCode)){
+        if("ebtp-agency-project-manager".equals(currentRoleCode)){
                 query.eq("project_manager", cacheUserService.getCacheUser().getUserId());
         }
 
@@ -166,9 +168,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
     }
 
     @Override
-    public IPage<ProjectEntrustVO> getPage(ProjectEntrustVO projectEntrust,String currentRoleCode) {
+    public IPage<ProjectEntrustVO> getPage(ProjectEntrustVO projectEntrust) {
 
-        QueryWrapper<ProjectEntrust> query = getProjectEntrustQueryWrapper(projectEntrust,currentRoleCode);
+        QueryWrapper<ProjectEntrust> query = getProjectEntrustQueryWrapper(projectEntrust);
 
         query.orderByDesc("id");