From b934f54d987efbfafbdcfcd792d03d48e1a6f6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Fri, 13 Nov 2020 17:40:04 +0800 Subject: [PATCH] fix --- .../performance/service/impl/ChartResultServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java index c0319d69..56bb3364 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ChartResultServiceImpl.java @@ -184,7 +184,7 @@ public class ChartResultServiceImpl implements ChartResultService { public PageUtils selectChartDetailList(ChartResultReq req) { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); //自己管理的和所有的部门交集 - log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds)); + log.info("selectChartDetailList 查询部门：" + JSON.toJSONString(allDeparmentIds)); List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); if(mandepartmentIds!=null ){ if(mandepartmentIds.size()==0){ @@ -196,6 +196,9 @@ public class ChartResultServiceImpl implements ChartResultService { return new PageUtils(); } } + else { + mandepartmentIds.retainAll(allDeparmentIds); + } log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds)); PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(), req.getPageSize()).doSelect( page -> resultRecordMapper.selectChartDetailList(page,mandepartmentIds,req.getStartId(),req.getScoreLevel())