From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java
index d29db6d..a16885b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/ubcs/codeapply/CodeReferTreePanel.java
@@ -10,6 +10,7 @@
import com.vci.base.ui.tree.VCIBaseTreeNode;
import com.vci.ubcs.codeapply.object.*;
import com.vci.ubcs.codeapply.utils.ConfigUtils;
+import com.vci.ubcs.codeapply.utils.HttpUtil;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import org.apache.commons.collections4.CollectionUtils;
@@ -29,8 +30,10 @@
private VCIBaseTreeNode rootNode = null;
private ReferTreObject referTreObject;
private UIFormRefer uiFormRefer;
- public CodeReferTreePanel(UIFormRefer uiFormRefer) {
+ private TokenUserObject tokenUserObject;
+ public CodeReferTreePanel(UIFormRefer uiFormRefer ,TokenUserObject tokenUserObject) {
this.uiFormRefer=uiFormRefer;
+ this.tokenUserObject=tokenUserObject;
}
public void buildTreePanel(){
@@ -52,9 +55,12 @@
condtionMap.put("parentFieldName",StringUtils.isBlank(uiFormRefer.getParentFieldName())?"":uiFormRefer.getParentFieldName());
condtionMap.put("textField",StringUtils.isBlank(uiFormRefer.getTextField())?"":uiFormRefer.getTextField());
condtionMap.put("muti",uiFormRefer.isMuti()?"true":"false");
- condtionMap.put("queryAllLevel", "false");//queryAllLevel
+ condtionMap.put("queryAllLevel", StringUtils.isBlank(uiFormRefer.getLoadType())?"false":"true");//queryAllLevel
//condtionMap.put("parentOid",null);
- R r=HttpUtil.sendGet(url+"/defaultReferTree",condtionMap,new HashMap<>());
+ Map<String,String> headerMap=new HashMap<>();
+ headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
+
+ R r= HttpUtil.sendGet(url+"/defaultReferTree",condtionMap,headerMap);
if(r.isSuccess()){
Object object= r.getData();
if(object!=null) {
--
Gitblit v1.9.3