From fb8627a02058ce2fef44297f4773b3d0ffc1c9d7 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 28 Dec 2020 10:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/service/app/impl/ResultRecordServiceImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 0888338e..39f85e70 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -1400,9 +1400,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowDetailResp.setStatus(status);
         StaffEntity staffEntity = staffService.selectStaffById(flowRecord.getApprovalStaffId());
         DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(flowRecord.getApprovalStaffId());
-        flowDetailResp.setAvatar(staffEntity.getAvatar());
-        DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
-        flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
+        if(departmentsStaffRelateEntity !=null ){
+            flowDetailResp.setAvatar(staffEntity.getAvatar());
+            DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
+            flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
+        }
         if (new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) {
             int position = getRole(loginUserId, departmentsStaffRelateEntity);
             /**
@@ -1422,6 +1424,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
 
     public int getRole(Long loginUserId, DepartmentsStaffRelateEntity departmentsStaffRelateEntity) {
+        if(departmentsStaffRelateEntity == null ){
+            return 0 ;
+        }
         int position = 0;
         StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId,
                 Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(), RoleEnums.MASTER_PM.getName()}));