From 3f50420b42259a88f7e623b16c14b00f52071f4c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 九月 2021 17:30:24 +0800
Subject: [PATCH] Merge branch 'test' into test_bak
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 5 +++--
1 files changed, 3 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 30f3da8..41c2119 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;
@@ -341,7 +342,7 @@
loginUserInfoVO.setVolunteerStatus(state);
}
//是否四长四员
- Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getUserId,sysUserDO.getUserId()));
+ Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
if(countFourMember>0){
loginUserInfoVO.setIsFourMember(1);
}
@@ -781,7 +782,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