From d9159cbb0a1065c703e6dcf33e3e8a53447b6077 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 22 Apr 2020 10:23:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BI-63837=20fix:=20=E5=85=A8=E9=80=89?=
 =?UTF-8?q?=E7=88=B6=E8=8A=82=E7=82=B9=E5=90=8E=E5=8E=BB=E9=80=89=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=90=E8=8A=82=E7=82=B9=E5=86=8D=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E6=AD=A4=E5=AD=90=E8=8A=82=E7=82=B9=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/tree/ztree/asynctree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/base/tree/ztree/asynctree.js b/src/base/tree/ztree/asynctree.js
index 2abbd121a..31508d645 100644
--- a/src/base/tree/ztree/asynctree.js
+++ b/src/base/tree/ztree/asynctree.js
@@ -204,7 +204,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                 if (BI.isNull(compare[n])) {
                     self._addTreeNode(map, parent, n, item);
                 } else if (BI.isEmpty(compare[n])) {
-                    self._addTreeNode(map, parent, n, item);
+                    self._addTreeNode(map, parent, n, {});
                 } else {
                     track(parent.concat([n]), node[n], compare[n]);
                 }

From 47bcf3bf8da1fab52c89d471f2e4945010e8f21f Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 22 Apr 2020 17:36:06 +0800
Subject: [PATCH 2/2] BI-63227 && BI-63837 fix: chinesePY

---
 src/base/tree/ztree/asynctree.js | 3 ++-
 src/core/utils/chinesePY.js      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/base/tree/ztree/asynctree.js b/src/base/tree/ztree/asynctree.js
index 31508d645..569ada929 100644
--- a/src/base/tree/ztree/asynctree.js
+++ b/src/base/tree/ztree/asynctree.js
@@ -140,6 +140,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                     delete pNode[name];
                 }
             }
+            this.options.paras.selectedValues = this._getJoinValue();
         }
         BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);
     },
@@ -204,7 +205,7 @@ BI.AsyncTree = BI.inherit(BI.TreeView, {
                 if (BI.isNull(compare[n])) {
                     self._addTreeNode(map, parent, n, item);
                 } else if (BI.isEmpty(compare[n])) {
-                    self._addTreeNode(map, parent, n, {});
+                    self._addTreeNode(map, parent, n, item);
                 } else {
                     track(parent.concat([n]), node[n], compare[n]);
                 }
diff --git a/src/core/utils/chinesePY.js b/src/core/utils/chinesePY.js
index e7c9fdf6b..d1b5ab17f 100644
--- a/src/core/utils/chinesePY.js
+++ b/src/core/utils/chinesePY.js
@@ -327,7 +327,7 @@
         36228: "QJ",
         36426: "XQ",
         36466: "DC",
-        36710: "JC",
+        36710: "CJ",
         36711: "ZYG",
         36767: "PB",
         36866: "SK",