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

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -145,9 +145,14 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //用户姓名
             userBean.setUserName(jsonObject.getString("userName"));
             //登录账号
+            String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("phone"));
+            if (StringUtils.isNotEmpty(jsonObject.getString("account"))) {
                 userBean.setLoginName(jsonObject.getString("account"));
+            } else {
+                userBean.setLoginName(phone);
+            }
             //手机号码
-            userBean.setPhonenumber(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,jsonObject.getString("phone")));
+            userBean.setPhonenumber(phone);
             //设置为默认密码
             userBean.setPassword("123456");
             userBean.setCreateTime(DateUtils.getNowDate());