From ccde9d0c2d3a3f4c9e14ef82fe05a7b1283c1b5c Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期六, 20 三月 2021 12:29:41 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 c1acd02..bab5b9e 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;
@@ -156,6 +157,8 @@
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setPhone(purePhoneNumber);
sysUserDO.setUserId(userId);
+ userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
+ userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
int i = userDao.updateById(sysUserDO);
if (i > 0) {
return R.ok();
@@ -225,6 +228,7 @@
});
loginUserInfoVO.setRoles(set);
}
+ loginUserInfoVO.setIsmemberrole(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
if (!ObjectUtils.isEmpty(phone)) {
@@ -234,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);
@@ -378,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);
}
@@ -442,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{
@@ -461,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);
}
@@ -590,8 +607,11 @@
SysUserDO sysUserDO=new SysUserDO();
sysUserDO.setUserId(userPhoneVO.getUserId());
sysUserDO.setPhone(newPhone);
+ userDao.updateMemberRole(newPhone, oldPhone);
+ userDao.updateServiceTeam(newPhone, oldPhone);
int update = userDao.updateById(sysUserDO);
if (update>0) {
+
return R.ok();
}
return R.fail();
@@ -1486,6 +1506,16 @@
return R.ok(eexcelUserDTOS);
}
+ @Override
+ public R getSysUserVOByPhone(String phone) {
+ SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,phone));
+ if (ObjectUtils.isEmpty(sysUserDO)) {
+ return R.fail("用户不存在");
+ }
+ SysUserVO sysUserVO = new SysUserVO();
+ BeanUtils.copyProperties(sysUserDO,sysUserVO);
+ return R.ok(sysUserVO);
+ }
public static void main(String[] args) {
// String encode = new BCryptPasswordEncoder().encode("lbsq123456");
--
Gitblit v1.7.1