From ec68c32a567629332dbdd2c018beaaa370531d1c Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 24 Aug 2023 11:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=AE=A1=E5=88=92=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8C=BA=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/performance/manage/PerformanceAppraisalPlanManage.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java index 4332e96..7c54e31 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java @@ -102,8 +102,9 @@ public class PerformanceAppraisalPlanManage { .like(StringUtils.isNotBlank(req.getPlanName()),PerformanceAppraisal::getName,req.getPlanName()) .ge(Objects.nonNull(req.getStart()),PerformanceAppraisal::getCreateOn,req.getStart()) .le(Objects.nonNull(req.getEnd()),PerformanceAppraisal::getCreateOn,req.getEnd()) - .eq(PerformanceAppraisal::getRegionCode,regionCode) + .eq(StringUtils.isNotBlank(regionCode), PerformanceAppraisal::getRegionCode,regionCode) .orderByDesc(PerformanceAppraisal::getUpdateOn); + // 如果登录用户是区域管理员,能看到本区域的评价计划 performanceAppraisalService.page(page,wrapper); if(0L == page.getTotal()){ return PageVo.empty();