From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java
index 80576d3..ff98e88 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java
@@ -1,10 +1,9 @@
 package com.vci.web.util;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.vci.corba.portal.data.PLPageDefination;
+import com.vci.client.common.providers.ClientServiceProvider;
+import com.vci.common.portal.constants.PLDefinationConstants;
+import com.vci.common.portal.constants.PRMConstants;
+import com.vci.corba.portal.PortalServicePrx;
 import com.vci.model.PLDefination;
 import com.vci.model.PRMDO;
 import com.vci.model.PRMItemDO;
@@ -14,10 +13,9 @@
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 
-import com.vci.client.common.providers.ClientServiceProvider;
-import com.vci.common.portal.constants.PLDefinationConstants;
-import com.vci.common.portal.constants.PRMConstants;
-import com.vci.corba.portal.PortalServicePrx;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 
 /**
@@ -542,6 +540,12 @@
 			node = rootNode.addElement(PLDefinationConstants.QUERYTEMPLATENAME);
 			node.setText(obj.getQueryTemplateName());
 
+			node = rootNode.addElement(PLDefinationConstants.BSDATAMODEL);
+			node.setText(obj.getBsDataModel());
+
+			node = rootNode.addElement(PLDefinationConstants.CSDATAMODEL);
+			node.setText(obj.getCsDataModel());
+
 			node = rootNode.addElement(PLDefinationConstants.SUBUIOBJTYPE);
 			node.setText(obj.getSubUiObjType());
 
@@ -662,6 +666,12 @@
 				elementText = root.elementText(PLDefinationConstants.QUERYTEMPLATENAME);
 				obj.setQueryTemplateName(elementText == null ? "" : elementText);
 
+				elementText = root.elementText(PLDefinationConstants.BSDATAMODEL);
+				obj.setBsDataModel(elementText == null ? "" : elementText);
+
+				elementText = root.elementText(PLDefinationConstants.CSDATAMODEL);
+				obj.setCsDataModel(elementText == null ? "" : elementText);
+
 				elementText = root.elementText(PLDefinationConstants.SUBUILAYOUT);
 				obj.setSubUILayout(elementText == null ? "" : elementText);
 			}

--
Gitblit v1.9.3