From dac93c472e18b1e99757f35f0cb80b02678353b5 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, 2 Nov 2020 10:13:54 +0800
Subject: [PATCH] fix

---
 .../modules/flow/service/impl/EvaluationGroupServiceImpl.java  | 2 +-
 .../performance/controller/AssessManagerController.java        | 2 +-
 .../performance/controller/EvaluationGroupController.java      | 1 +
 .../performance/service/impl/AssessManagerServiceImpl.java     | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 36ededf1..fc9571f3 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -310,7 +310,7 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 			}
 
 			if(evaluationGroup.getConfirm()==0){
-				return R.error(notInGroupNames + "已在其他类型为月度的考评组中，是否改为到此考评组中进行考核");
+				return R.error(504,notInGroupNames + "已在其他类型为月度的考评组中，是否改为到此考评组中进行考核");
 			}
 			evaluationGroups.forEach(evaluationGroup12 -> {
                 List<String> staffs = map.get(evaluationGroup12.getId());
diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
index 4aa7cc3a..c8818327 100644
--- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
+++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java
@@ -94,7 +94,7 @@ public class AssessManagerController {
 
     @PostMapping("assess/manager/change")
     @ApiOperation("考核管理组管理变更")
-    @ApiResponses({@ApiResponse(code = 200,message = "成功")})
+    @ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 503,message = "去设置")})
     public R assessChange(@RequestBody AssessChangeReq req){
         if(req.getStartId()==null){
             return R.error("考核id不能为空");
diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
index 9bad290b..81425007 100644
--- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
+++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java
@@ -193,6 +193,7 @@ public class EvaluationGroupController {
 
     @PostMapping("/checkStaff")
     @ApiOperation("校验是否有跨组人员")
+    @ApiResponses({@ApiResponse(code = 200,message = "成功"),@ApiResponse(code = 504,message = "已跨组")})
     public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) {
         return evaluationGroupService.checkStaff(checkStaffReq);
     }
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
index 3dae8a4a..3e2a660c 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
@@ -169,8 +169,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
                     notInGroupNames = notInGroupNames + dto.getName() + " ";
                 }
 
-                throw new RRException(notInGroupNames + "未加入月度类型考评组，被考核人需要加入月度考评组后才能参与当前月度考核。");
-
+                return R.error(503,notInGroupNames + "未加入月度类型考评组，被考核人需要加入月度考评组后才能参与当前月度考核。");
             }
 
             //初始化添加用户的数据