bug修改

Null

2021-03-20 ccde9d0c2d3a3f4c9e14ef82fe05a7b1283c1b5c

 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;
@@ -388,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);
    }

@@ -452,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{
@@ -471,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);
    }

@@ -1498,7 +1505,18 @@
        List<EexcelUserDTO> eexcelUserDTOS=userDao.selectExport(exportUserDTO);
        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");
//        System.out.println(encode);