diff --git a/src/com/engine/organization/entity/SelectOptionParam.java b/src/com/engine/organization/entity/SelectOptionParam.java index 7e27c490..8690b3be 100644 --- a/src/com/engine/organization/entity/SelectOptionParam.java +++ b/src/com/engine/organization/entity/SelectOptionParam.java @@ -1,16 +1,13 @@ package com.engine.organization.entity; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.api.browser.bean.SearchConditionOption; -import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; /** - * @description: TODO * @author:dxfeng * @createTime: 2022/06/13 * @version: 1.0 @@ -20,16 +17,21 @@ public class SelectOptionParam { /** * 下拉框Json转换 * - * @param datas + * @param customValue * @return */ - public static List convertJsonToListOption(String datas) { + public static List convertJsonToListOption(String customValue) { List selectOptions = new ArrayList<>(); - if (StringUtils.isNotBlank(datas)) { - JSONArray objectArray = JSON.parseArray(datas); - int size = objectArray.size(); + JSONArray objects = JSONObject.parseArray(customValue); + if (objects.size() < 3) { + return selectOptions; + } + JSONObject o = (JSONObject) objects.get(2); + JSONArray datas = o.getJSONArray("datas"); + if (!datas.isEmpty()) { + int size = datas.size(); for (int i = 0; i < size; i++) { - JSONObject jsonObject = (JSONObject) objectArray.get(i); + JSONObject jsonObject = (JSONObject) datas.get(i); SearchConditionOption option = new SearchConditionOption(jsonObject.getString("key"), jsonObject.getString("option")); selectOptions.add(option); }