This commit is contained in:
wulin 2020-11-16 15:08:09 +08:00
parent 2cc3f35379
commit 017cbb7f3a

View File

@ -350,6 +350,9 @@ public class ResultRecordController extends AbstractController {
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()){
//不是自己的绩效判断是否为绩效管理人员老板部门管理人员
@ -363,16 +366,21 @@ public class ResultRecordController extends AbstractController {
if(value.length() > 0){
startId = Long.parseLong(value);
resultRecord = lzResultRecordService.selectResultRecordByStaffIdAndStartId(getUserId(), startId);
if(resultRecord == null){
return R.error("绩效不存在");
}
}
}
if(resultRecord == null){
resultRecord = lzResultRecordService.selectLastResultRecordByUserId(getUserId());//根据token获取
}else{
//根据token获取
resultRecord = lzResultRecordService.selectLastResultRecordByUserId(getUserId());
if(resultRecord == null){
return R.error("绩效不存在");
}
}
//获取考核维度等信息
ResultRecordDetailDto resultRecordDetailDto = new ResultRecordDetailDto();
BeanUtils.copyProperties(resultRecord, resultRecordDetailDto);