From 017cbb7f3a3438c7022c363befa8765976a6f0b5 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 16 Nov 2020 15:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 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 24f5a9f8..4982eba4 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -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);