From 6772cde0dce428e3e95b1477e72aaad3312137a1 Mon Sep 17 00:00:00 2001 From: hades Date: Fri, 27 Nov 2020 15:09:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-44225=20=E5=87=BA=E7=8E=B0npe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/TableDataNameObjectCreator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java index 3f0f08f35..7dedc9f47 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java @@ -157,7 +157,9 @@ public class TableDataNameObjectCreator extends NameObjectCreator { * @param names 名字 */ public void addNames(String names) { - this.names.add(names); + if (names != null) { + this.names.add(names); + } } /** From def28a8873e313ea3ca8f2de1192f41ba2618d90 Mon Sep 17 00:00:00 2001 From: Yvan Date: Fri, 27 Nov 2020 16:38:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-44298=20alpha-fine=E6=90=9C=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=9A=84url=E5=8F=91=E7=94=9F=E5=8F=98=E5=8C=96=E4=BA=86=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E5=9C=A8?= =?UTF-8?q?crm=E9=87=8C=E6=8F=90=E4=BA=A4=E4=BA=91=E7=AB=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E5=AF=B9=E5=BA=94value=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=E4=B9=9F=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=B8=8Burl=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E7=9A=84?= =?UTF-8?q?key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/search/manager/impl/DocumentSearchManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java index 216c7e9db..be3ac4f1b 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java @@ -65,12 +65,12 @@ public class DocumentSearchManager implements AlphaFineSearchProvider { } SearchResult searchResult = new SearchResult(); for (int j = 0; j < searchText.length; j++) { - String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j] + AlphaFineConstants.FIRST_PAGE; + String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j]; try { String result = HttpToolbox.get(url); AlphaFineHelper.checkCancel(); JSONObject jsonObject = new JSONObject(result); - JSONArray jsonArray = jsonObject.optJSONArray("docdata"); + JSONArray jsonArray = jsonObject.optJSONArray("list"); if (jsonArray != null) { for (int i = 0; i < jsonArray.length(); i++) {