From 55a8369f030a4645c762946b2b056c389fec5679 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 13 十月 2021 10:28:39 +0800
Subject: [PATCH] 爱心义仓捐赠相关代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 d9ee378..423cf0f 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
@@ -14,6 +14,7 @@
 
 import javax.annotation.Resource;
 
+import cn.hutool.core.util.IdcardUtil;
 import com.panzhihua.service_user.dao.*;
 import com.panzhihua.service_user.model.dos.*;
 import org.apache.commons.lang.time.DateFormatUtils;
@@ -323,6 +324,7 @@
         }
         loginUserInfoVO.setIsmemberrole(2);
         loginUserInfoVO.setIsFourMember(2);
+        loginUserInfoVO.setIsCommunityWorker(2);
         // 志愿者状态
         String phone = sysUserDO.getPhone();
         Long userCommunityId = sysUserDO.getCommunityId();
@@ -351,6 +353,7 @@
             Integer isSysUser = userDao.selectCountSysUser(phone, userCommunityId);
             if (countTeam != null && countTeam > 0) {
                 loginUserInfoVO.setIsmemberrole(1);
+                loginUserInfoVO.setIsCommunityWorker(1);
             } else if (selectCountMemberRole != null && selectCountMemberRole > 0) {
                 loginUserInfoVO.setIsmemberrole(1);
             } else if (isSysUser != null && isSysUser > 0) {
@@ -781,7 +784,7 @@
         sysUserDO.setIdCard(idCard);
         // 通过身份证号判断性别以及出生日期
         sysUserDO.setSex(IdCard.sex(idCard));
-        sysUserDO.setBirthday(IdCard.birthDay(idCard));
+        sysUserDO.setBirthday(IdcardUtil.getBirthDate(idCard));
         if (!StringUtils.isEmpty(loginUserInfoVO.getJob())) {
             sysUserDO.setJob(loginUserInfoVO.getJob());
         }

--
Gitblit v1.7.1