From 19ec0269a9ce3a57ccfcd1d36585bb1c31977b60 Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期五, 10 一月 2025 10:25:22 +0800 Subject: [PATCH] ui定义为树或树表时默认设置orientation为positive --- 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: 鏇挎崲鏍戝畾涔変笂鐨勬鍙嶅悜鏌ヨ灞炴�э紝鍥犱负姝e弽鍚戞煡璇㈡槸鐢遍摼鎺ョ被鍨嬫煡璇㈡ā鏉夸笂鎺у埗鐨� 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