wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
wulin 2020-11-16 15:08:09 +08:00
parent 2cc3f35379
commit 017cbb7f3a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

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