From de8fa66bb3e81463a407e74dc1037bfd50202574 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 29 Sep 2020 09:59:57 +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

---
 .../modules/app/controller/ResultRecordController.java   | 4 ++--
 .../sys/service/app/impl/ResultDetailServiceImpl.java    | 9 +++++----
 .../sys/service/app/impl/ResultRecordServiceImpl.java    | 1 -
 src/main/resources/mapper/app/ResultDetailMapper.xml     | 2 +-
 4 files changed, 8 insertions(+), 8 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 da9b9341..b3d12f82 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -398,12 +398,12 @@ public class ResultRecordController extends AbstractController {
             }
             if(batchOpt == 3 ){
                 for (ResultRecord resultRecord : resultRecords) {
-                    r = resultRecordService.reject(resultRecord,1); //更新驳回状态
+                    r = resultRecordService.approval(resultRecord.getId(), resultRecord.getCurrentApprovalStaffId(),null,false);
                     if (!r.isSuccess()) {
                         return r;
                     }
                 }
-            } else {
+            } else if(batchOpt == 4 ){
                 for (ResultRecord resultRecord : resultRecords) {
                     List<FlowRecord> list = flowRecordService.selectFlowRecordByResultRecordIdType(resultRecord.getId(), 2);
                     for (int i = list.size() - 1; i >= 0; i--) {
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
index d5d8afed..2b7dc8fe 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
@@ -4,14 +4,16 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lz.common.utils.BigDecimalUtil;
 import com.lz.common.utils.Constant;
-import com.lz.common.utils.StringUtil;
 import com.lz.modules.app.entity.StaffEntity;
 import com.lz.modules.app.resp.ResultDetailResp;
 import com.lz.modules.app.resp.Step;
 import com.lz.modules.app.service.DepartmentsService;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.app.utils.t.TwoTuple;
-import com.lz.modules.flow.entity.*;
+import com.lz.modules.flow.entity.Flow;
+import com.lz.modules.flow.entity.FlowDepartment;
+import com.lz.modules.flow.entity.FlowRecord;
+import com.lz.modules.flow.entity.FlowRelation;
 import com.lz.modules.flow.model.Auth;
 import com.lz.modules.flow.model.StaffRoleDto;
 import com.lz.modules.flow.service.*;
@@ -257,14 +259,13 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
 					StaffEntity flowStaff = staffService.selectStaffById(flowDepartment.getStaffId());
 					roleNameMap.put(departmentLevel,flowStaff.getName());
 				}else{
-					Long roleId = flows.get(flowIndex - 1).getRoleId();
+					Long roleId = flows.size() > flowIndex - 1 ? flows.get(flowIndex - 1).getRoleId() : null;
 					List<StaffRoleDto> staffRoleDtos = new ArrayList<>();
 					StaffEntity approvalStaff = resultRecordService.getApprovalStaff(resultRecord, departmentLevel, staffRoleDtos, roleId);
 					roleNameMap.put(departmentLevel,approvalStaff.getName());
 				}
 			}
 		}
-
 		log.info("approvalList approval : " + Arrays.toString(approvalList.toArray()) + " roleNameMap : " + JSON.toJSONString(roleNameMap));
 		for (int i = flowIndex; i < flowIndex + 10; i++) {
 			int index = resultRecordService.getDepartmentLevelIndex(flows, i);
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 82d34c42..53ba9a98 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
@@ -526,7 +526,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 .put("type", WorkMsgTypeEnum.SUBMIT);
     }
 
-
     @Override
     public StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel,List<StaffRoleDto> staffRoleDtos, Long roleId) {
         StaffEntity approvalStaff = null;
diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml
index bfab52ee..9528b9fc 100644
--- a/src/main/resources/mapper/app/ResultDetailMapper.xml
+++ b/src/main/resources/mapper/app/ResultDetailMapper.xml
@@ -97,7 +97,7 @@
             <if test="priority != null">priority = #{priority}</if>
         </trim>
         ,gmt_modified = now()
-        where id = #{id}
+        where id = #{id} limit 1
     </update>