From 3b801b499e394596263ef1e10ff99012917a7c75 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@vci-tech.com>
Date: 星期五, 20 十二月 2024 23:16:28 +0800
Subject: [PATCH] 调整Object和CBO之间的属性值赋值

---
 Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebLifeCycleServiceImpl.java |    2 +-
 Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java                         |    7 +++++--
 2 files changed, 6 insertions(+), 3 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 7e0bf7a..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);
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
index e1037a1..282e1d0 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
@@ -1176,7 +1176,10 @@
 							}else{
 								fieldValue = getStringValueFromObject(value);
 							}
-							setValueForFieldFromCbo(fieldAttrMap.get(field.getName().toLowerCase()), obj, fieldValue);
+							String fieldName = fieldAttrMap.get(field.getName().toLowerCase());
+							if(StringUtils.isNotBlank(fieldName)){
+								setValueForFieldFromCbo(fieldName, obj, fieldValue);
+							}
 						}
 					}
 				}
@@ -1619,7 +1622,7 @@
 	 * @return base寮傚父瀵硅薄
 	 */
 	public static VciBaseException getVciBaseException(PLException e){
-		return new VciBaseException(e.code, new java.lang.String[]{e.getMessage()});
+		return new VciBaseException(e.code, new String[]{e.getMessage()});
 	}
 
 	/**

--
Gitblit v1.9.3