From dba2b8fa7830de783b698d22671d63bdf2de9521 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 06 五月 2024 16:45:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java
index 06c31c3..30dfe01 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealControllerTramp.java
@@ -30,8 +30,10 @@
@Override
public void execute(Object data) {
Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
- DbSv sv = (DbSv)objs[0] ;
- PrControllerTramp rtuTramp = (PrControllerTramp)objs[2] ;
- sv.savePrConctrollerTramp(rtuTramp);
+ PrControllerTramp tramp = (PrControllerTramp)objs[2] ;
+ if(tramp != null){
+ DbSv sv = (DbSv)objs[0] ;
+ sv.savePrConctrollerTramp(tramp);
+ }
}
}
--
Gitblit v1.8.0