Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/BillSearchActivity.java

@@ -217,8 +217,6 @@ public class BillSearchActivity extends OABaseActivity {
                     groupModels.add(groupModel);
                 }
             }
-        } else if (mPageIndex > 1) {
-            mPageIndex--;
         }
         setAdapter(groupModels);
     }
@@ -253,9 +251,14 @@ public class BillSearchActivity extends OABaseActivity {
                 if (showModels == null) {
                     showModels = new ArrayList<>();
                 }
-                showModels.addAll(groupModels);
+                if (!ListUtils.isEmpty(groupModels)) {
+                    showModels.addAll(groupModels);
+                }
             }
             mListAdapter.updateGroupModels(showModels);
         }
+        if (ListUtils.isEmpty(groupModels) && mPageIndex > 1) {
+            mPageIndex--;
+        }
     }
 }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/fragment/CustomerListDetailsFragment.java

@@ -177,7 +177,6 @@ public class CustomerListDetailsFragment extends ViewPagerLazyFragment {
                 JSONObject data = listdata.getJSONObject(i);
                 int id = JSONUtil.getInt(data, keyField);
                 String status = JSONUtil.getText(data, "cu_auditstatus");
-
                 for (int j = 0; j < columns.size(); j++) {
                     JSONObject column = columns.getJSONObject(j);
                     if (JSONUtil.getInt(column, "width") > 0) {
@@ -188,7 +187,7 @@ public class CustomerListDetailsFragment extends ViewPagerLazyFragment {
                         String caption = JSONUtil.getText(column, "caption");
                         String dataIndex = JSONUtil.getText(column, "dataIndex");
                         String values = JSONUtil.getText(data, dataIndex);
-                        if (!TextUtils.isEmpty(dataIndex)){
+                        if (!TextUtils.isEmpty(dataIndex)&&i==0){
                             fieldConfig.add(dataIndex);
                         }
                         BillListGroupModel.BillListField billListField = new BillListGroupModel.BillListField();