Browse Source

Merge pull request #2997 in DESIGN/design from final/10.0 to persist/10.0

* commit 'aa7670846451d69b98e6fabf114c11f115065af5':
  REPORT-44298 alpha-fine搜不到帮助文档 【问题原因】之前的搜索帮助文档的url发生变化了 【改动思路】在crm里提交云端配置中对应value值修改的申请,代码中也需要调整一下url,以及修改一下返回数据中获取搜索结果的key
  REPORT-44225 出现npe
persist/10.0
superman 4 years ago
parent
commit
fa3c42a602
  1. 4
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java
  2. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java

4
designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java

@ -157,7 +157,9 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
* @param names 名字 * @param names 名字
*/ */
public void addNames(String names) { public void addNames(String names) {
this.names.add(names); if (names != null) {
this.names.add(names);
}
} }
/** /**

4
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(); SearchResult searchResult = new SearchResult();
for (int j = 0; j < searchText.length; j++) { 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 { try {
String result = HttpToolbox.get(url); String result = HttpToolbox.get(url);
AlphaFineHelper.checkCancel(); AlphaFineHelper.checkCancel();
JSONObject jsonObject = new JSONObject(result); JSONObject jsonObject = new JSONObject(result);
JSONArray jsonArray = jsonObject.optJSONArray("docdata"); JSONArray jsonArray = jsonObject.optJSONArray("list");
if (jsonArray != null) { if (jsonArray != null) {
for (int i = 0; i < jsonArray.length(); i++) { for (int i = 0; i < jsonArray.length(); i++) {

Loading…
Cancel
Save