Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -19,6 +19,7 @@ import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sms.api.SmsApi;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.CollectionUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import com.usoftchina.saas.utils.RegexpUtils;
 import com.usoftchina.sso.api.SsoUserApi;
 import com.usoftchina.sso.api.SsoUserSpaceApi;
@@ -141,7 +142,11 @@ public class AccountController {
         if (ssoCheckMobile.isHasRegister()){
             map.put("hasRegister", true);
             Account account = accountService.findByMobile(mobile);
-            map.put("username", account.getRealname());
+            if (ObjectUtils.isEmpty(account)){
+                map.put("username", null);
+            }else {
+                map.put("username", account.getRealname());
+            }
             if (account != null){
                 List<CompanyBaseVO> companyBaseVOList = companyService.findBaseByAccountId(account.getId());
                 for (CompanyBaseVO companyBaseVO : companyBaseVOList){