From 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d Mon Sep 17 00:00:00 2001
From: hhhyyq <hhhyyq@163.com>
Date: 星期三, 17 三月 2021 00:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 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 e111781..b83cf08 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
@@ -21,6 +21,7 @@
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
+import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
@@ -227,6 +228,7 @@
});
loginUserInfoVO.setRoles(set);
}
+ loginUserInfoVO.setIsmemberrole(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
if (!ObjectUtils.isEmpty(phone)) {
@@ -236,6 +238,13 @@
}else{
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
+ }
+ Integer countTeam = userDao.selectCountTeam(phone);
+ Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+ if(countTeam!=null&&countTeam>0) {
+ loginUserInfoVO.setIsmemberrole(1);
+ }else if(selectCountMemberRole!=null&&selectCountMemberRole>0) {
+ loginUserInfoVO.setIsmemberrole(1);
}
}
return R.ok(loginUserInfoVO);
@@ -380,6 +389,10 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<LoginUserInfoVO> iPage = userDao.pageUser(page, loginUserInfoVO);
+ iPage.getRecords().forEach(record->{
+ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
+ record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
+ });
return R.ok(iPage);
}
@@ -444,9 +457,9 @@
}
Integer isRent = sysUserInputDO1.getIsRent();
ComMngFamilyInfoVO comMngFamilyInfoVO=new ComMngFamilyInfoVO();
- comMngFamilyInfoVO.setIdCard(sysUserInputDO1.getIdCard());
+ comMngFamilyInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(sysUserInputDO1.getIdCard()));
comMngFamilyInfoVO.setName(name);
- comMngFamilyInfoVO.setPhone(sysUserInputDO1.getPhone());
+ comMngFamilyInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(sysUserInputDO1.getPhone()));
if (isRent.intValue()==0) {
comMngFamilyInfoVO.setRelationship("家人");
}else{
@@ -463,6 +476,8 @@
if (!ObjectUtils.isEmpty(comActVO)) {
loginUserInfoVO.setCommunityName(comActVO.getName());
}
+ loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
+ loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
return R.ok(loginUserInfoVO);
}
--
Gitblit v1.7.1