From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebLifeCycleServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebLifeCycleServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebLifeCycleServiceImpl.java
index 878a2b4..581fa0b 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebLifeCycleServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebLifeCycleServiceImpl.java
@@ -358,7 +358,7 @@
}else {
OsLifeCycleLineEventVO[] eventVOs = new OsLifeCycleLineEventVO[route.transitionVOEvents.length];
for (int i = 0; i < route.transitionVOEvents.length; i++) {
- com.vci.corba.omd.lcm.TransitionVOEvent event = route.transitionVOEvents[i];
+ TransitionVOEvent event = route.transitionVOEvents[i];
OsLifeCycleLineEventVO eventVO = new OsLifeCycleLineEventVO();
eventVO.setOid(event.id);
eventVO.setEventFullName(event.name);
@@ -372,7 +372,7 @@
life.setLines(lineVOS);
life.setStartStatus(lifeCycle.startState);
life.setStartStatusName(statusVOMap.getOrDefault(lifeCycle.startState,new OsStatusVO()).getName());
- life.setName(lifeCycle.tag);
+ life.setName(lifeCycle.label);
try {
life.setTs(VciDateUtil.str2Date(lifeCycle.ts,VciDateUtil.DateTimeMillFormat));
} catch (Exception e) {
--
Gitblit v1.9.3