From 7db3ee6e84714a868e0b57a61a033d050b1a61fc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 21:06:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
index 7406ba9..efef233 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LinkTypeWrapper.java
@@ -49,8 +49,9 @@
 		});
 		vo.setFromBtmTypes(fromBtm);
 		vo.setToBtmTypes(toBtm);
+		vo.setTableName(Optional.ofNullable(vo.getTableName()).orElseGet(String::new).toUpperCase(Locale.ROOT));
 		// 鏋氫妇澶勭悊
-		vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
+		vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getBizDomain()));
 		return vo;
 	}
 

--
Gitblit v1.9.3