Merge remote-tracking branch 'origin/branch_new' into branch_new

MainModule/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java

@@ -183,7 +183,7 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement
     }
 
     public void loginSuccess(List<UserBean> userBean) {
-        if (userBean == null) {
+        if (userBean == null || userBean.isEmpty()) {
 //            ToastUtils.showShort("登录失败请重试");
             return;
         }