Parcourir la source

合并代码,处理一元捐的bug

Bitliker il y a 8 ans
Parent
commit
37fce40f00

+ 14 - 6
app_modular/apputils/src/main/java/com/modular/apputils/activity/SelectNetAcitivty.java

@@ -174,7 +174,7 @@ public class SelectNetAcitivty extends OABaseActivity {
     private void handleData(String messgae) throws Exception {
         LogUtil.prinlnLongMsg("gongpengming", "messgae=" + messgae);
         JSONObject object = JSON.parseObject(messgae);
-        JSONArray dbfinds = JSONUtil.getJSONArray(object, "dbfinds","gridDbfinds");
+        JSONArray dbfinds = JSONUtil.getJSONArray(object, "dbfinds", "gridDbfinds");
         String dataStr = JSONUtil.getText(object, "data");
         JSONArray data = JSON.parseArray(dataStr);
         setData2Adapter(data, dbfinds);
@@ -187,8 +187,8 @@ public class SelectNetAcitivty extends OABaseActivity {
         String fieldKeyLike = null;
         for (int i = 0; i < dbfinds.size(); i++) {
             config = dbfinds.getJSONObject(i);
-            String dbGridField = JSONUtil.getText(config, "dbGridField","ds_dbfindfield");
-            String field = JSONUtil.getText(config, "field","ds_gridfield");
+            String dbGridField = JSONUtil.getText(config, "dbGridField", "ds_dbfindfield");
+            String field = JSONUtil.getText(config, "field", "ds_gridfield");
             if (!StringUtil.isEmpty(dbGridField) && !StringUtil.isEmpty(field)) {
                 if (field.equals(fieldKey)) {
                     fieldKeyLike = dbGridField;
@@ -200,17 +200,25 @@ public class SelectNetAcitivty extends OABaseActivity {
         Bean b = null;
         List<Bean> models = new ArrayList<>();
         Map<String, String> jsonMap = null;
+//        StringBuilder builder = new StringBuilder();
         for (int i = 0; i < data.size(); i++) {
             o = data.getJSONObject(i);
             b = new Bean();
-            b.name = JSONUtil.getText(o, fieldKeyLike);
+
+//            builder.append(JSONUtil.getText(o, fieldKeyLike) + ",");
             jsonMap = new HashMap<>();
             for (Map.Entry<String, String> e : configMap.entrySet()) {
-                jsonMap.put(e.getValue(), JSONUtil.getText(o, e.getKey()));
+                String value = JSONUtil.getText(o, e.getKey());
+                jsonMap.put(e.getValue(), value);
+//                builder.append(JSONUtil.getText(o, value + ","));
             }
+//            StringUtil.removieLast(builder);
+            b.name = JSONUtil.getText(o, fieldKeyLike) ;
             b.json = JSONUtil.map2JSON(jsonMap);
-            if (!StringUtil.isEmpty(b.name))
+            if (!StringUtil.isEmpty(b.name)) {
                 models.add(b);
+            }
+//            builder.delete(0, builder.length() - 1);
         }
         if (mAdapter == null) {
             mAdapter = new ListAdapter(models);