From b0c35fcd570996500f97e41954d481e8fd3a675f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Tue, 10 Nov 2020 14:03:23 +0800 Subject: [PATCH] fix --- .../controller/AssessManagerController.java | 17 ++++++++++++++--- .../performance/controller/ChartController.java | 2 ++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index c8818327..7329fb9e 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -15,6 +15,7 @@ import com.lz.modules.performance.res.ChartStatistical; import com.lz.modules.performance.res.ChartStatisticalRes; import com.lz.modules.performance.service.AssessManagerService; import com.lz.modules.performance.service.ChartResultService; +import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.service.app.ResultRecordService; import io.swagger.annotations.*; @@ -33,7 +34,7 @@ import java.util.List; @RequestMapping("/performance") @Slf4j @Api(value="考核管理接口", tags={"考核管理"}) -public class AssessManagerController { +public class AssessManagerController extends AbstractController{ @Autowired private FlowStartMapper flowStartMapper; @@ -49,8 +50,14 @@ public class AssessManagerController { @ApiOperation("获取考核列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerListRes.class)}) public R assessList(@RequestBody AssessListReq req){ - PageUtils pageUtils = assessManagerService.assessList(req); - return R.ok().put("data",pageUtils); + try { + Long userId = getUserId(); + req.setLoginUserId(userId); + PageUtils pageUtils = assessManagerService.assessList(req); + return R.ok().put("data",pageUtils); + } catch (Exception e) { + return R.error(); + } } @PostMapping("assess/manager/detail") @@ -62,6 +69,8 @@ public class AssessManagerController { } PageUtils pageUtils = null; try { + Long userId = getUserId(); + req.setLoginUserId(userId); pageUtils = assessManagerService.assessDetail(req); } catch (Exception e) { log.error("获取考核详情列表异常" ,e); @@ -82,6 +91,8 @@ public class AssessManagerController { } List process = null; try { + Long userId = getUserId(); + req.setLoginUserId(userId); process = chartResultService.countAssessNumByFlowProcess(req); } catch (Exception e) { log.error("获取详情顶部人数统计异常" ,e); 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 64d25b01..2ea6de62 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -79,6 +79,8 @@ public class ChartController extends AbstractController{ public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ PageUtils pageUtils = null; try { + Long userId = getUserId(); + req.setLoginUserId(userId); pageUtils = chartResultService.selectChartDetailList(req); } catch (Exception e) { log.error("获取报表等级详情异常" ,e);