diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index d4cc6556..01d8012a 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -349,33 +349,37 @@ public class ResultRecordController extends AbstractController { String value = param.get("id").toString(); if(value.length() > 0){ id = Long.parseLong(value); - resultRecord = lzResultRecordService.selectResultRecordById(id); - if(resultRecord == null){ - return R.error("绩效不存在"); - } - //下面判断权限 - if(user.getUserId().longValue() != resultRecord.getStaffId().longValue()){ - //不是自己的绩效,判断是否为绩效管理人员,老板,部门管理人员 - log.info("不是自己的绩效"); - } } - - }else if(param.containsKey("startId")){//根据startId和token获取 String value = param.get("startId").toString(); if(value.length() > 0){ startId = Long.parseLong(value); + } + } + + if(id == null){ + if(startId == null){ + //根据token获取 + resultRecord = lzResultRecordService.selectLastResultRecordByUserId(getUserId()); + if(resultRecord == null){ + return R.error("绩效不存在"); + } + }else{ resultRecord = lzResultRecordService.selectResultRecordByStaffIdAndStartId(getUserId(), startId); if(resultRecord == null){ return R.error("绩效不存在"); } } }else{ - //根据token获取 - resultRecord = lzResultRecordService.selectLastResultRecordByUserId(getUserId()); + resultRecord = lzResultRecordService.selectResultRecordById(id); if(resultRecord == null){ return R.error("绩效不存在"); } + //下面判断权限 + if(user.getUserId().longValue() != resultRecord.getStaffId().longValue()){ + //不是自己的绩效,判断是否为绩效管理人员,老板,部门管理人员 + log.info("不是自己的绩效"); + } } //获取考核维度等信息