From 115ba80cfd41258574d0e215e427cb041e21b40f Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 12 五月 2021 10:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 379ab94..3280fd0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -253,6 +253,7 @@
                 loginUserInfoVO.setIsmemberrole(1);
             }
         }
+        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
         return R.ok(loginUserInfoVO);
     }
 
@@ -593,8 +594,9 @@
         SysUserDO sysUserDO = new SysUserDO();
         sysUserDO.setName(name);
         sysUserDO.setIdCard(idCard);
-        sysUserDO.setSex(loginUserInfoVO.getSex());
-        sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
+        //通过身份证号判断性别以及出生日期
+        sysUserDO.setSex(IdCard.sex(idCard));
+        sysUserDO.setBirthday(IdCard.birthDay(idCard));
         sysUserDO.setJob(loginUserInfoVO.getJob());
         sysUserDO.setUserId(loginUserInfoVO.getUserId());
         sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());

--
Gitblit v1.7.1