From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 03 十二月 2024 15:01:43 +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..84b7a58 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.QUERYTEMPLATENAME); + node.setText(obj.getBsCustQueryCLsOrUrl()); + + node = rootNode.addElement(PLDefinationConstants.QUERYTEMPLATENAME); + node.setText(obj.getCsCustQueryCLsOrUrl()); + 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.BSCUSTQUERYCLSORURL); + obj.setBsCustQueryCLsOrUrl(elementText == null ? "" : elementText); + + elementText = root.elementText(PLDefinationConstants.CSCUSTQUERYCLSORURL); + obj.setCsCustQueryCLsOrUrl(elementText == null ? "" : elementText); + elementText = root.elementText(PLDefinationConstants.SUBUILAYOUT); obj.setSubUILayout(elementText == null ? "" : elementText); } -- Gitblit v1.9.3