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 062cb7a6..16d2a884 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -52,7 +52,7 @@ public class ChartController extends AbstractController{ chartStatisticalRes = chartResultService.chartReport(startId,userId); } catch (Exception e) { log.error("获取绩效报表统计异常" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok().put("data",chartStatisticalRes); } @@ -62,12 +62,12 @@ public class ChartController extends AbstractController{ @ApiOperation("获取考核类型列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStartsRes.class)}) public R chartStarts(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true)ChartStartsReq req){ - PageUtils pageUtils = null; + PageUtils pageUtils; try { pageUtils = chartResultService.chartStarts(req); } catch (Exception e) { log.error("获取考核类型列表异常" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok().put("data",pageUtils); } @@ -77,14 +77,14 @@ public class ChartController extends AbstractController{ @ApiOperation("获取报表等级详情") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ResultRankListRes.class)}) public R chartDetailList(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) ChartResultReq req){ - PageUtils pageUtils = null; + PageUtils pageUtils; try { Long userId = getUserId(); req.setLoginUserId(userId); pageUtils = chartResultService.selectChartDetailList(req); } catch (Exception e) { log.error("获取报表等级详情异常" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok().put("data",pageUtils); } 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 5c59eafc..d1277728 100644 --- a/src/main/java/com/lz/modules/performance/controller/UserTaskController.java +++ b/src/main/java/com/lz/modules/performance/controller/UserTaskController.java @@ -31,13 +31,13 @@ public class UserTaskController extends AbstractController{ @ApiOperation("获取待办/处理事项") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = TaskListRes.class)}) public R list(@RequestBody @ApiParam(name = "body",value = "body请求体",required = true) AssessTaskReq req){ - PageUtils pageUtils = null; + PageUtils pageUtils; try { Long userId = getUserId(); pageUtils = assessService.userTaskList(req, userId); } catch (Exception e) { log.error("获取用户事项异常 userId:" ,e); - return R.error(); + return R.error(e.getMessage()); } return R.ok().put("data",pageUtils); }