From db353c890eddb927dacb171e03173c1e1e2657ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Thu, 5 Nov 2020 09:17:14 +0800 Subject: [PATCH] fix --- .../modules/performance/controller/ChartController.java | 3 +-- .../performance/controller/UserTaskController.java | 4 ++-- .../service/impl/AssessManagerServiceImpl.java | 3 +-- .../performance/service/impl/ChartResultServiceImpl.java | 9 +++------ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index 26f33562..1cbc1293 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -43,8 +43,7 @@ public class ChartController extends AbstractController{ public R chartResult(@RequestParam(required = false) @ApiParam(name = "startId",value = "考核周期标识id") Long startId){ List chartStatisticalRes = null; try { - //Long userId = getUserId(); - Long userId = 313L; + Long userId = getUserId(); chartStatisticalRes = chartResultService.chartReport(startId,userId); } catch (Exception e) { log.error("获取绩效报表统计异常" ,e); diff --git a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java index 8aef05e2..5c59eafc 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -33,8 +33,8 @@ public class UserTaskController extends AbstractController{ public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ PageUtils pageUtils = null; try { - //Long userId = getUserId(); - pageUtils = assessService.userTaskList(req, 313L); + Long userId = getUserId(); + pageUtils = assessService.userTaskList(req, userId); } catch (Exception e) { log.error("获取用户事项异常 userId:" ,e); return R.error(); diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 5e1600b7..ca2e70f7 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -105,8 +105,7 @@ public class AssessManagerServiceImpl implements AssessManagerService { log.info("未找到考核发起数据"); return pageUtils; } - //List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); - List mandepartmentIds = Collections.EMPTY_LIST; + List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); list.forEach(flowStart -> { AssessManagerListRes res = new AssessManagerListRes(); String name = flowStart.getName(); 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 ea3bd1c3..131fe4f2 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 @@ -88,8 +88,7 @@ public class ChartResultServiceImpl implements ChartResultService { } } //自己管理的部门 - //List mandepartmentIds = assessService.roleDepartments(staffId); - List mandepartmentIds = Collections.EMPTY_LIST; + List mandepartmentIds = assessService.roleDepartments(staffId); List data = new ArrayList<>(); ChartStatisticalRes res; @@ -183,8 +182,7 @@ public class ChartResultServiceImpl implements ChartResultService { List allDeparmentIds = staffService.selectAllDeparmentIdsByDepartmentParentId(req.getDepartmentId()); //自己管理的和所有的部门交集 log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(allDeparmentIds)); - //List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); - List mandepartmentIds = Collections.EMPTY_LIST; + List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); log.info("selectChartDetailList 管理部门：" + JSON.toJSONString(mandepartmentIds)); mandepartmentIds.retainAll(allDeparmentIds); log.info("selectChartDetailList 交集部门：" + JSON.toJSONString(mandepartmentIds)); @@ -225,8 +223,7 @@ public class ChartResultServiceImpl implements ChartResultService { public List countAssessNumByFlowProcess(AssessDetailReq req) { List process = resultRecordMapper.countAssessNumByFlowProcess(req); //获取自己管理的部门 - //List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); - List mandepartmentIds = Collections.EMPTY_LIST; + List mandepartmentIds = assessService.roleDepartments(req.getLoginUserId()); List data = buildProcess(process, req.getStartId(),mandepartmentIds); return data; }