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..affce51 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") @@ -102,9 +104,11 @@ public class ProjectEntrustController{ @ApiOperation("查询分页数据") @PostMapping("/getPage") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-sub-admin','ebtp-agency-admin','ebtp-agency-project-manager')") - public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust){ + public BaseResponse> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectEntrustVO projectEntrust, + @RequestHeader(name = "currentRoleCode", required = false) String currentRoleCode){ - return BaseResponse.success(projectEntrustService.getPage(projectEntrust)); + log.info("查询分页数据 currentRoleCode:"+currentRoleCode); + return BaseResponse.success(projectEntrustService.getPage(projectEntrust,currentRoleCode)); } 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 ed4b031..7c8b0e1 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{ * @param projectEntrust 委托单查询信息 * @return 返回结果 */ - IPage getPage(ProjectEntrustVO projectEntrust); + IPage getPage(ProjectEntrustVO projectEntrust,String currentRoleCode); /** * 分派项目经理 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 316f7df..d6a6a7e 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,14 +105,14 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust) { + private QueryWrapper getProjectEntrustQueryWrapper(ProjectEntrustVO projectEntrust,String currentRoleCode) { QueryWrapper query = new QueryWrapper<>(); //项目名称 if(StringUtils.isNotBlank(projectEntrust.getProjectName())){ query.like("project_name", projectEntrust.getProjectName()); } - - String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode(); + log.info("查询分页数据 currentRoleCode2:"+cacheUserService.getCacheUser().getCurrentRoleCode()); + //String currentRoleCode = cacheUserService.getCacheUser().getCurrentRoleCode(); //采购经理查 采购经理 if("ebtp-purchase".equals(currentRoleCode)){ @@ -166,9 +166,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl getPage(ProjectEntrustVO projectEntrust) { + public IPage getPage(ProjectEntrustVO projectEntrust,String currentRoleCode) { - QueryWrapper query = getProjectEntrustQueryWrapper(projectEntrust); + QueryWrapper query = getProjectEntrustQueryWrapper(projectEntrust,currentRoleCode); query.orderByDesc("id");