From 2cc3f353791679f1bc73b7ae0f34b7a8b4854ed6 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 16 Nov 2020 14:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9id=E4=BC=A0=E7=A9=BA?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) 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 d24d3eb2..24f5a9f8 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -346,23 +346,31 @@ public class ResultRecordController extends AbstractController { ResultRecord resultRecord = null; if(param.containsKey("id")){ - id = Long.parseLong(param.get("id").toString()); - resultRecord = lzResultRecordService.selectResultRecordById(id); - //下面判断权限 - if(user.getUserId().longValue() != resultRecord.getStaffId().longValue()){ - //不是自己的绩效，判断是否为绩效管理人员，老板，部门管理人员 - log.info("不是自己的绩效"); + String value = param.get("id").toString(); + if(value.length() > 0){ + id = Long.parseLong(value); + resultRecord = lzResultRecordService.selectResultRecordById(id); + //下面判断权限 + if(user.getUserId().longValue() != resultRecord.getStaffId().longValue()){ + //不是自己的绩效，判断是否为绩效管理人员，老板，部门管理人员 + log.info("不是自己的绩效"); + } } + + }else if(param.containsKey("startId")){//根据startId和token获取 - startId = Long.parseLong(param.get("startId").toString()); - resultRecord = lzResultRecordService.selectResultRecordByStaffIdAndStartId(getUserId(), startId); - }else{//根据token获取 - resultRecord = lzResultRecordService.selectLastResultRecordByUserId(getUserId()); + String value = param.get("startId").toString(); + if(value.length() > 0){ + startId = Long.parseLong(value); + resultRecord = lzResultRecordService.selectResultRecordByStaffIdAndStartId(getUserId(), startId); + } } - if(resultRecord == null){ - return R.error("绩效不存在"); + resultRecord = lzResultRecordService.selectLastResultRecordByUserId(getUserId());//根据token获取 + if(resultRecord == null){ + return R.error("绩效不存在"); + } } //获取考核维度等信息