From 2d3aecea8114fb8b53e27fc149c4cd8e6ca19634 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 27 Aug 2020 18:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/impl/ResultRecordServiceImpl.java       | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 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 70ea6a8f..31be988e 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
@@ -363,19 +363,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         StaffEntity staff = staffService.selectStaffById(resultRecord.getStaffId());
         int flowIndex = lastFlowRecord != null ? lastFlowRecord.getFlowIndex() + 1 : 1;
         int index = getDepartmentLevelIndex(flows, flowIndex);
-        if (index < 0) {             //表示流程己经结束
+        if (index < 0 || index >= approvalList.size()) {             //表示流程己经结束
             lastFlowRecord.setFlowName(mySelf.getName() + "-审批通过");
             flowRecordService.updateCoverFlowRecordById(lastFlowRecord);
-
-
-
             resultRecordService.updateFlowStaffIdRoleToNull(resultRecord.getId());// 更新用户权限
             return R.ok("流程审批结束")
                     .put("from", staff)
                     .put("to", staff)
                     .put("type", WorkMsgTypeEnum.PASS);
         }
-
         FlowRecord flowRecord = new FlowRecord();
         flowRecord.setRecordId(resultRecordId);
         flowRecord.setRecordStaffId(resultRecord.getStaffId());
@@ -383,35 +379,36 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowRecord.setFlowId(flowId);
         String departmentLevel = approvalList.get(index);
         flowRecord.setDepartmentLevel(departmentLevel);
+
         StaffEntity approvalStaff = null;
         List<StaffRoleDto> staffRoleDtos = new ArrayList<>();
+        Long roleId = flows.get(flowIndex - 1).getRoleId();
         if (Constant.ME.equals(departmentLevel)) {                  //如果是自己
             approvalStaff = staff; // 是自己进行审批
-            StaffRoleDto staffRoleDto = new StaffRoleDto(staff.getId(), flows.get(flowIndex - 1).getRoleId());
+            StaffRoleDto staffRoleDto = new StaffRoleDto(staff.getId(), roleId);
             staffRoleDtos.add(staffRoleDto);
         } else {
             FlowDepartment flowD = staffEntityMap.get(departmentLevel);
             if (flowD == null) {
                 List<StaffRole> staffRoles = staffRoleService.selectByRole(departmentLevel);
-
                 for (StaffRole staffRole : staffRoles) {
                     List<StaffRoleDepartment> staffRoleDepartments = staffRoleDepartmentService.selectStaffRoleDepartmentByStaffRoleId(staffRole.getId());
                     Map<String, String> departmentIdMap = departmentsService.selectUserAllDepartmentIds(resultRecord.getDepartmentId());
                     for (StaffRoleDepartment staffRoleDepartment : staffRoleDepartments) {
                         String value = departmentIdMap.get(staffRoleDepartment.getDepartmentId());
                         if (StringUtil.isNotBlank(value)) {
-                            StaffRoleDto staffRoleDto = new StaffRoleDto(staffRole.getStaffId(), TypeRoleDto.getRoleId(staffRole.getTypeRoleIds(), resultRecord.getType()));
+                            StaffRoleDto staffRoleDto = new StaffRoleDto(staffRole.getStaffId(), roleId != null && roleId > 0 ? roleId :
+                                    TypeRoleDto.getRoleId(staffRole.getTypeRoleIds(), resultRecord.getType()));
                             staffRoleDtos.add(staffRoleDto);
                         }
                     }
                 }
-
                 if (staffRoleDtos.size() >= 1) { //表示只有一个审批的用户
                     approvalStaff = staffService.selectStaffById(staffRoleDtos.get(0).getStaffId());
                 }
             } else {
                 approvalStaff = staffService.selectStaffById(flowD.getStaffId());
-                StaffRoleDto staffRoleDto = new StaffRoleDto(approvalStaff.getId(), flows.get(flowIndex - 1).getRoleId());
+                StaffRoleDto staffRoleDto = new StaffRoleDto(approvalStaff.getId(), roleId);
                 staffRoleDtos.add(staffRoleDto);
             }
         }