From 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 14:09:32 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 eccb533..45a1387 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
@@ -230,6 +230,7 @@
loginUserInfoVO.setIsmemberrole(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
+ Long userCommunityId = sysUserDO.getCommunityId();
if (!ObjectUtils.isEmpty(phone)) {
ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
@@ -238,8 +239,9 @@
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
}
- Integer countTeam = userDao.selectCountTeam(phone);
- Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+ //是否是"管理员"或者 本社区 "社区团队"、"党委成员"
+ Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
+ Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
Integer isSysUser = userDao.selectCountSysUser(phone);
if (countTeam != null && countTeam > 0) {
loginUserInfoVO.setIsmemberrole(1);
@@ -415,7 +417,7 @@
/**
* 人员详情
- *
+ *detailuser
* @param userId 用户id
* @return 人员详情
*/
@@ -1501,10 +1503,13 @@
String idCard = sysUserDO.getIdCard();
if (!ObjectUtils.isEmpty(idCard)) {
communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
- communityUserInfoVO.setBirthday(IdCard.birthDay(idCard));
+ communityUserInfoVO.setBirthday(sysUserDO.getBirthday());
communityUserInfoVO.setIdCard(idCard);
}
communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
+ communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack());
+ communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront());
+ communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook());
communityUserInfoVO.setName(sysUserDO.getName());
String phone = sysUserDO.getPhone();
communityUserInfoVO.setPhone(phone);
--
Gitblit v1.7.1