From caaf6f75ce967aee458bd52b3ae8c5e6589cd213 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 20 Nov 2020 10:42:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=A9=E6=95=88=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 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 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("不是自己的绩效");
+            }
         }
 
         //获取考核维度等信息