最终合并打包代码

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/SelectAimPresenter.java

@@ -74,10 +74,10 @@ public class SelectAimPresenter implements HttpHandler.OnResultListener {
             }
         } else {
             if (StringUtils.isEmpty(keyWork)) {
-                if (iSelectAim != null) {
-                    iSelectAim.showModel(models);
-                    return;
-                }
+                for (SelectAimModel m : models)
+                    m.setFirst(false);
+                iSelectAim.showModel(models);
+                return;
             }
             if (keyList == null)
                 keyList = new ArrayList<>();
@@ -332,7 +332,6 @@ public class SelectAimPresenter implements HttpHandler.OnResultListener {
             if (keyList == null || hasEmpty(keyList)) {
                 keyList = new ArrayList<>();
             }
-
             show(keyList);
         } else
             show(models);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/OfficeAddressSettingsActivity.java

@@ -32,9 +32,10 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.OfficeAddressBean;
 import com.xzjmyk.pm.activity.bean.oa.PlatSignAddressBean;
+import com.xzjmyk.pm.activity.bean.oa.SearchPoiParam;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationSearchActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchLocationActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;