审批移除人员bug

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -1484,7 +1484,13 @@ public class SpmkController {
 			isFinal = true;
 			isFinal = true;
 		}
 		}
 		//执行中的人会存在操作记录
 		//执行中的人会存在操作记录
-		SpmkApproveExecuteRecord spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(currentUser.getId()), spmkApproveDetailSummary.getApproveSummaryId());
+		SpmkApproveExecuteRecord spmkApproveExecuteRecord;
+		//执行中的人会存在操作记录/spmk/delteApprove
+		if (spmkApproveDetailDto.getApproveExecuteRecordId()!=null) {
+			spmkApproveExecuteRecord = SpmkApproveExecuteRecord.builder().id(spmkApproveDetailDto.getApproveExecuteRecordId()).build().selectById();
+		} else {
+			spmkApproveExecuteRecord = spmkApproveExecuteRecordMapper.selectExecuteRecordById(Integer.parseInt(currentUser.getId()), spmkApproveDetailSummary.getApproveSummaryId());
+		}
 		//删除操作人记录
 		//删除操作人记录
 		if (spmkApproveExecuteRecord != null) {
 		if (spmkApproveExecuteRecord != null) {
 			SpmkExecutor spmkExecutor =SpmkExecutor.builder().build().selectOne(new LambdaQueryWrapper<SpmkExecutor>()
 			SpmkExecutor spmkExecutor =SpmkExecutor.builder().build().selectOne(new LambdaQueryWrapper<SpmkExecutor>()

src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java

@@ -65,4 +65,7 @@ public class SpmkApproveDetailDto {
 
 
 	private Integer userIndex;//插入审批人的当前用户索引
 	private Integer userIndex;//插入审批人的当前用户索引
 
 
+	private Integer approveExecuteId;
+	private Integer approveExecuteRecordId;
+
 }
 }