Browse Source

拜访地址修改

Bitliker 9 years ago
parent
commit
e089be332e

+ 14 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java

@@ -68,9 +68,7 @@ public class SelectAimPresenter implements HttpHandler.OnResultListener {
                     return;
                     return;
                 }
                 }
             }
             }
-            if (ListUtils.isEmpty(keyList))
-                keyList = new ArrayList<>();
-            else keyList.clear();
+            keyList = new ArrayList<>();
             boolean isFirst = true;
             boolean isFirst = true;
             for (SelectAimModel e : models) {
             for (SelectAimModel e : models) {
                 if (isIncude(keyWork, e)) {
                 if (isIncude(keyWork, e)) {
@@ -196,6 +194,9 @@ public class SelectAimPresenter implements HttpHandler.OnResultListener {
                 if (ListUtils.isEmpty(models)) {
                 if (ListUtils.isEmpty(models)) {
                     showEmpty();
                     showEmpty();
                 } else {
                 } else {
+                    if (hasEmpty(keyList)) {
+                        keyList = new ArrayList<>();
+                    }
                     keyList.addAll(models);
                     keyList.addAll(models);
                     showEmpty();
                     showEmpty();
                 }
                 }
@@ -277,12 +278,22 @@ public class SelectAimPresenter implements HttpHandler.OnResultListener {
         if (!StringUtils.isEmpty(keyWork)) {//有搜索
         if (!StringUtils.isEmpty(keyWork)) {//有搜索
             if (ListUtils.isEmpty(keyList))
             if (ListUtils.isEmpty(keyList))
                 keyList = new ArrayList<>();
                 keyList = new ArrayList<>();
+            if (hasEmpty(keyList)) {
+                keyList = new ArrayList<>();
+            }
             keyList.addAll(models);
             keyList.addAll(models);
             show(keyList);
             show(keyList);
         } else
         } else
             show(models);
             show(models);
     }
     }
 
 
+    private boolean hasEmpty(List<SelectAimModel> keyList) {
+        if (ListUtils.isEmpty(keyList)) return false;
+        for (SelectAimModel e : keyList)
+            if (e.getType() == 1) return true;
+        return false;
+    }
+
     private void show(List<SelectAimModel> models) {
     private void show(List<SelectAimModel> models) {
         if (iSelectAim != null) {
         if (iSelectAim != null) {
             iSelectAim.showModel(models);
             iSelectAim.showModel(models);