From 97b6110373d1f81fb1d1281f09211230f547a1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Mon, 14 Dec 2020 14:29:54 +0800
Subject: [PATCH] fix

---
 .../app/controller/ResultRecordController.java    |  3 ++-
 .../controller/ResultTaskController.java          | 10 ++++------
 .../performance/service/ResultTaskService.java    |  3 ++-
 .../service/impl/ResultTaskServiceImpl.java       | 15 +++++++++++----
 4 files changed, 19 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 95f5633f..dbd02b6f 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -752,6 +752,7 @@ public class ResultRecordController extends AbstractController {
     @PostMapping("/saveDetail")
     @ApiOperation("保存绩效详情-吴林")
     public R saveDetail(@RequestBody @ApiParam ResultRecordDetailDto dto) {
+        Long userId = getUserId();
         ResultRecord resultRecord = new ResultRecord();
         BeanUtils.copyProperties(dto, resultRecord);
         resultRecord.setAllScore(resultRecord.getLastScore());
@@ -874,7 +875,7 @@ public class ResultRecordController extends AbstractController {
                                 taskReq.setName(taskDto.getName());
                                 taskReq.setOrderBy(orderBy);
                                 taskReq.setProcessRate(BigDecimal.valueOf(taskDto.getProcessRate()));
-                                resultTaskService.saveOrUpdateResultTask(taskReq);
+                                resultTaskService.saveOrUpdateResultTask(taskReq,userId);
                                 orderBy++;
                             }
 
diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
index fe99d0fb..6af16f55 100644
--- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
@@ -9,6 +9,7 @@ import com.lz.modules.performance.req.ResultUpdateTaskReq;
 import com.lz.modules.performance.res.ResultTaskDetailRes;
 import com.lz.modules.performance.service.ResultTaskService;
 import com.lz.modules.performance.service.TaskProcessRecordService;
+import com.lz.modules.sys.controller.AbstractController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -26,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/performance")
 @Slf4j
 @Api(value="绩效任务接口", tags={"绩效任务"})
-public class ResultTaskController {
+public class ResultTaskController extends AbstractController{
 
     @Autowired
     private ResultTaskService resultTaskService;
@@ -47,11 +48,8 @@ public class ResultTaskController {
     @ApiOperation("任务新增或修改")
     @ApiResponses({@ApiResponse(code = 200,message = "成功")})
     public R changeTask(@RequestBody ResultUpdateTaskReq req){
-        int i = resultTaskService.saveOrUpdateResultTask(req);
-        if(i>0){
-            return R.ok();
-        }
-        return R.error();
+        Long userId = getUserId();
+        return resultTaskService.saveOrUpdateResultTask(req,userId);
     }
 
 
diff --git a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java
index ff9d59e8..566990e9 100644
--- a/src/main/java/com/lz/modules/performance/service/ResultTaskService.java
+++ b/src/main/java/com/lz/modules/performance/service/ResultTaskService.java
@@ -1,6 +1,7 @@
 package com.lz.modules.performance.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.lz.common.utils.R;
 import com.lz.modules.performance.dto.ResultTaskDto;
 import com.lz.modules.performance.entity.ResultTask;
 import com.lz.modules.performance.req.ResultUpdateTaskReq;
@@ -36,7 +37,7 @@ public interface ResultTaskService extends IService<ResultTask> {
 
 	ResultTaskDetailRes taskDetail(Long detailId);
 
-	int saveOrUpdateResultTask(ResultUpdateTaskReq req);
+	R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId);
 
 
 
diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
index f26d4217..b2f18d98 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
@@ -2,6 +2,7 @@ package com.lz.modules.performance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lz.common.utils.BigDecimalUtil;
+import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.service.StaffService;
@@ -124,23 +125,28 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 	}
 
 	@Override
-	public int saveOrUpdateResultTask(ResultUpdateTaskReq req) {
+	public R saveOrUpdateResultTask(ResultUpdateTaskReq req, Long userId) {
 		Long tasklId = req.getTaskId();
 		Long detailId = req.getDetailId();
 		if(tasklId == null && detailId == null){
 			log.error("任务保存或更新失败：tasklId, detailId都为空");
-			return -1;
+			return R.error();
 		}
 		ResultTask resultTask;
 		if(tasklId == null){
 			log.info("绩效任务新增操作。。。");
+			ResultDetail resultDetail = resultDetailService.selectResultDetailById(req.getDetailId());
+			if(!userId.equals(resultDetail.getStaffId())){
+				log.info("非本人任务不能添加");
+				return R.error("非本人任务不能添加");
+			}
 			resultTask = new ResultTask();
 			BeanUtils.copyProperties(req,resultTask);
 			resultTask.setDetailId(detailId);
 			resultTaskMapper.insertResultTask(resultTask);
 			//将插入的id传递过去
 			req.setTaskId(resultTask.getId());
-			int i = changeTaskProcess(null, req,null);
+			changeTaskProcess(null, req,null);
 		}
 		else {
 
@@ -163,7 +169,8 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		}
 		ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
 		resultDetail.setProcessRate(BigDecimal.valueOf(caclateResultDetailProcess(detailId)));
-		return resultDetailService.updateResultDetailById(resultDetail);
+		resultDetailService.updateResultDetailById(resultDetail);
+		return R.ok();
 
 	}