From 4d52ed743295b5ddd77848d72366a7128374950b Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 12 Nov 2020 09:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89=E9=A2=86?=
 =?UTF-8?q?=E5=AF=BC=E6=97=B6=EF=BC=8C=E4=BB=8E=E7=BB=A9=E6=95=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E9=87=8C=E9=9D=A2=E6=89=BE=E4=BA=BA=E8=AF=84?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java  | 7 ++++---
 src/main/java/com/lz/modules/app/dao/StaffDao.java         | 2 ++
 src/main/java/com/lz/modules/app/service/StaffService.java | 2 ++
 .../com/lz/modules/app/service/impl/StaffServiceImpl.java  | 5 +++++
 .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 2 +-
 src/main/resources/mapper/generator/StaffDao.xml           | 7 +++++++
 6 files changed, 21 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 b14f6f35..0b932a69 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -387,9 +387,10 @@ public class ResultRecordController extends AbstractController {
                     staffs.addAll(departManagers.getManagers());
                 }
             }
-            /*if(staffs.size() == 0){
-                return R.error("找不到有效的评分人，设置的评分人不存在");
-            }*/
+            if(staffs.size() == 0){
+                log.info("无法找到评分人员，开始找绩效管理人员");
+                staffs = staffService.findManger(resultRecord.getId(), 4);
+            }
 
             for (StaffEntity staff:staffs
             ) {
diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java
index 70f7b8c8..8a367679 100644
--- a/src/main/java/com/lz/modules/app/dao/StaffDao.java
+++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java
@@ -98,4 +98,6 @@ public interface StaffDao extends BaseMapper<StaffEntity> {
     List<StaffEntity> selectNamesByIds(@Param("list") List<Long> sIds);
 
     List<StaffEntity> selectStaffsByGroupId(@Param("copyId") Long copyId);
+
+    List<StaffEntity> findManger(@Param("recordId") Long recordId, @Param("flowProcess") int flowProcess);
 }
diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java
index dad4c18f..936f6f45 100644
--- a/src/main/java/com/lz/modules/app/service/StaffService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffService.java
@@ -103,5 +103,7 @@ public interface StaffService extends IService<StaffEntity> {
     List<StaffEntity> selectNamesByIds(List<Long> sIds);
     //获取绩效考核管理员
     List<StaffEntity> selectStaffsByGroupId(Long copyId);
+
+    List<StaffEntity> findManger(Long recordId, int flowProcess);
 }
 
diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
index d2a37b33..a15333aa 100644
--- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
+++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java
@@ -529,5 +529,10 @@ public class StaffServiceImpl extends ServiceImpl<StaffDao, StaffEntity> impleme
         return staffDao.selectStaffsByGroupId(copyId);
     }
 
+    @Override
+    public List<StaffEntity> findManger(Long recordId, int flowProcess){
+        return staffDao.findManger(recordId, flowProcess);
+    }
+
 
 }
diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index cba4b3fd..d1420cdd 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -383,7 +383,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 			evaluationGroup =
 					evaluationGroupService.selectEvaluationGroupByCopyId(evaluationGroup.getId(),flowStart.getId());
 			if(evaluationGroup == null){
-				log.info("无法找到拷贝组信息");
+				log.info("无法assess/manager/detail找到拷贝组信息");
 				return 5;
 			}
 			//以下代码没必要更新，因为这个拷贝分用不到。正确的对应关系清查看lz_evaluation_start_staff
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 187511c6..102b4ab8 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -545,4 +545,11 @@
         ) and is_delete=0) as staff join lz_staff_occupation as occupation on staff.id = occupation.staff_id where occupation.staff_status=0
 
     </select>
+
+    <select id="findManger" resultType="com.lz.modules.app.entity.StaffEntity">
+        select staff.* from lz_staff as staff join lz_flow_record as record
+        on record.approval_staff_id = staff.id
+        where record.record_id = #{recordId} and record.flow_process=#{flowProcess}
+
+    </select>
 </mapper>