From 12f2fafc574afb4c534ab59244f2b954d1876e9f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:37:20 +0800
Subject: [PATCH] 解决回传工控网记录无法撤销的问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml | 3 ++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 10 ++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
index b070eb5..b879b5a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
@@ -13,9 +13,10 @@
<!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
- select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time,n.process_instance_id
+ select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time,currnode.process_instance_id
from mdm_dnc_back_file f
join mdm_nc_node_his n on f.nc_node_id=n.id
+ left join mdm_nc_node currnode on f.nc_node_id=currnode.id
left join mdm_machine m on n.machine_code=m.code
<where>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
index 8660a66..fda21c1 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -66,12 +66,10 @@
* 妫�鏌ユ祦绋嬪疄渚嬫槸鍚﹁鎵ц杩囷紙閫氳繃鍘嗗彶璁板綍锛�
*/
public boolean isProcessExecuted(String processInstanceId) {
- // 妫�鏌ユ槸鍚︽湁鍘嗗彶娲诲姩璁板綍
- /*
- long activityCount = historyService.createHistoricActivityInstanceQuery()
- .processInstanceId(processInstanceId)
- .count();
- */
+ if(StringUtils.isBlank(processInstanceId)){
+ //绌烘祦绋嬪疄渚媔d锛岃鏄庤妭鐐瑰凡缁忔病鏈変簡
+ return true;
+ }
// 妫�鏌ユ槸鍚︽湁鍘嗗彶浠诲姟璁板綍
long taskCount = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInstanceId)
--
Gitblit v1.9.3