diff --git a/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt
index f58428e976..47cf37b308 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/UserInfoEntity.kt
@@ -29,6 +29,7 @@ class UserInfoEntity {
 
     var contact: String? = null
 
+    @SerializedName("id_card")
     @TypeConverters(IdCardTypeConverter::class)
     var idCard: IdCardEntity? = null
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java
index 191f51b0fd..76b26a5a25 100644
--- a/app/src/main/java/com/gh/gamecenter/user/UserRepository.java
+++ b/app/src/main/java/com/gh/gamecenter/user/UserRepository.java
@@ -300,8 +300,7 @@ class UserRepository {
                                 break;
                             case UserViewModel.TYPE_ID_CARD:
                                 mCacheUserInfoEntity.setIdCard(GsonUtils.Companion.getInstance().fromJsonBean(content, IdCardEntity.class));
-                            default:
-                                return;
+                                break;
                         }
 
                         userInfoHandle(mCacheUserInfoEntity, true);
diff --git a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java
index 17c16b9ca5..9c6ed34624 100644
--- a/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java
+++ b/app/src/main/java/com/halo/assistant/fragment/user/UserInfoEditFragment.java
@@ -179,6 +179,7 @@ public class UserInfoEditFragment extends NormalFragment {
                     mIdCardNameEt.setEnabled(false);
                     mIdCardEt.setText(idCard.getId());
                     mIdCardEt.setEnabled(false);
+                    if (mSaveMenuItem != null) mSaveMenuItem.setVisible(false);
                 } else {
                     if (mSaveMenuItem != null) mSaveMenuItem.setVisible(true);
                 }
@@ -230,7 +231,7 @@ public class UserInfoEditFragment extends NormalFragment {
                 toast("必须使用18位的身份证号码");
                 return;
             }
-            String regIdCard = "^\\d{15}$|^\\d{17}[0-9Xx]$";
+            String regIdCard = "^[1-9]\\d{5}([1-9]\\d{3})(0\\d|1[0-2])([0-2]\\d|3[0-1])\\d{3}[\\dXx]$";
             if (!idCard.matches(regIdCard)) {
                 toast("身份证无效，请重新输入");
                 return;