From f13fcaa8c4b0f413d8ee100adcb67669db183c68 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 23 八月 2025 16:47:58 +0800
Subject: [PATCH] 固化程序不可用锁定
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
index b098e0a..2ac2343 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
@@ -1,7 +1,6 @@
package org.springblade.mdm.flow.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -12,9 +11,7 @@
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
import org.springblade.mdm.flow.vo.ApproveRecordVO;
-import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -34,9 +31,9 @@
return this.getBaseMapper().listByNcProgramId(ncProgramId);
}
- public void saveApproveRecords(Task task, String processInstanceId, String operateResult, String comment) {
+ public void saveApproveRecords(Task task, String operateResult, String comment) {
- String processDefinitionKey = flowCommonService.getDefinitionKey(processInstanceId);
+ String processDefinitionKey = flowCommonService.getDefinitionKey(task.getProcessInstanceId());
ApproveRecord rec = new ApproveRecord();
rec.setTaskName(task.getName());
@@ -44,8 +41,9 @@
//rec.setNcProgramId(refObj.getNcProgramId());
rec.setOperateResult(operateResult);//瀹℃壒缁撴灉
rec.setOperateTime(DateUtil.now());
- rec.setProcessInstanceId(processInstanceId);
+ rec.setProcessInstanceId(task.getProcessInstanceId());
rec.setProcessDefinitionKey(processDefinitionKey);
+ rec.setTaskDefinitionKey(task.getTaskDefinitionKey());
rec.setUserId(AuthUtil.getUserId());
rec.setUserNickname(AuthUtil.getNickName());
--
Gitblit v1.9.3