审批bug

12a71464 · 翁国栋 · 078aabd0 · 12a71464
Commit 12a71464 authored Sep 20, 2023 by 翁国栋
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+10 -2

No files found.
--- a/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
+++ b/src/main/java/cn/timer/api/controller/spmk/SpmkController.java
@@ -1257,8 +1257,15 @@ public class SpmkController {
                        if (!listFlowChildren.get(currentIndex).getExecute().equals("1") && !listFlowChildren.get(currentIndex).getExecute().equals("0")) {
                            //如果当前索引下的都要变更为0未执行
                            FlowChildren flowChildren = listFlowChildren.get(spmkApproveDetailDto.getIndex());
-                            User user = flowChildren.getRelation().get(0).getUsers().get(spmkApproveDetailDto.getUserIndex());
+                            SpmkApproveExecuteRecord spmkApproveExecuteRecord=null;
-                            SpmkApproveExecuteRecord spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(user.getId()), spmkApproveDetailSummary.getApproveSummaryId());
+                            //如果有执行记录
+                            if(spmkApproveDetailDto.getApproveExecuteRecordId()>0){
+                                spmkApproveExecuteRecord=spmkApproveExecuteRecordMapper.selectById(spmkApproveDetailDto.getApproveExecuteRecordId());
+                            }else{
+                                User user = flowChildren.getRelation().get(0).getUsers().get(spmkApproveDetailDto.getUserIndex());
+                                spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(user.getId()), spmkApproveDetailSummary.getApproveSummaryId());
+                            }
                            //删除审批过的人记录
                            if (spmkApproveExecuteRecord != null) {
                                spmkApproveExecuteRecordMapper.delExecuteRecord(spmkApproveExecuteRecord.getId(), spmkApproveDetailSummary.getApproveSummaryId());
@@ -1305,6 +1312,7 @@ public class SpmkController {
            SpmkApproveDetailSummary.builder().id(spmkApproveDetailDto.getId())
                    .flowChildren(JSONArray.fromObject(listFlowChildren).toString()).build().updateById();
        } catch (Exception e) {
+            e.printStackTrace();
            return ResultUtil.error(e);
        }