From 18c43123b51a1688ab4ae01fe3d171c7d92e619b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期四, 16 一月 2025 18:19:34 +0800
Subject: [PATCH] 1、调整会话过期提示 2、流程设计器隐藏拓展按钮，隐藏右下角图标
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
index 7a75659..78105b6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
@@ -449,10 +449,14 @@
//TODO: 鏇挎崲鏍戝畾涔変笂鐨勬鍙嶅悜鏌ヨ灞炴�э紝鍥犱负姝ｅ弽鍚戞煡璇㈡槸鐢遍摼鎺ョ被鍨嬫煡璇㈡ā鏉夸笂鎺у埗鐨�
boolean isOrientation = false; //鏄惁鍙嶅悜锛屼娇鐢ㄦā鏉夸笂閰嶇疆鐨�
String qtName = treeDefineVO.getQueryTemplateName();
- if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){
- QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName);
- QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName);
- isOrientation = qt.getDirection().equals("opposite");
+ if(Func.isNotBlank(treeDefineVO.getOrientation())){
+ isOrientation = treeDefineVO.getOrientation().equalsIgnoreCase("opposite");
+ }else{
+ if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){
+ QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName);
+ QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName);
+ isOrientation = qt.getDirection().equals("opposite");
+ }
}
if(treeQuery.getConditionMap() == null){
treeQuery.setConditionMap(new HashMap<>());
@@ -663,11 +667,16 @@
UITreeDefineVO treeDefineVO = componentVO.getTreeDefineVO();
boolean isOrientation = false; //鏄惁鍙嶅悜锛屼娇鐢ㄦā鏉夸笂閰嶇疆鐨�
String qtName = treeDefineVO.getQueryTemplateName();
- if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){
- QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName);
- QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName);
- isOrientation = qt.getDirection().equals("opposite");
+ if(Func.isNotBlank(treeDefineVO.getOrientation())){
+ isOrientation = treeDefineVO.getOrientation().equalsIgnoreCase("opposite");
+ }else{
+ if(Func.isNotBlank(treeDefineVO.getLinkType()) && Func.isNotBlank(qtName)){
+ QTInfo wrapper = platformClientUtil.getQTDService().getQT(qtName);
+ QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), qtName);
+ isOrientation = qt.getDirection().equals("opposite");
+ }
}
+
String queryTemplate = StringUtils.isNotBlank(treeQuery.getQueryTemplate())?treeQuery.getQueryTemplate():(!CollectionUtils.isEmpty(treeQuery.getSourceData())? (String) treeQuery.getSourceData().getOrDefault("querytemplate",treeDefineVO.getQueryTemplateName()) :treeDefineVO.getQueryTemplateName());
Map<String, Object> replaceMap = wrapperReplaceMap(treeQuery.getSourceData());
List<String> queryFieldList = new ArrayList<>();
--
Gitblit v1.9.3