CeDo
2021-05-31 db3376279794f2216be07cc2bb298c9a2faf33e6
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -585,7 +585,7 @@
    public R putUserCommunityArea(LoginUserInfoVO loginUserInfoVO) {
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setCommunityId(loginUserInfoVO.getCommunityId());
        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
//        sysUserDO.setAreaId(loginUserInfoVO.getAreaId());
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        int update = userDao.updateById(sysUserDO);
        if (update > 0) {
@@ -755,7 +755,7 @@
    @Override
    public R listFamily(Long userId,Long pageNum, Long pageSize) {
        List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
        LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId);
        LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId).orderByDesc(ComMngFamilyInfoDO::getCreateAt);
        IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query);
        if (!ObjectUtils.isEmpty(pageData.getRecords())) {
            pageData.getRecords().forEach(comMngFamilyInfoDO -> {
@@ -864,6 +864,29 @@
                throw new ServiceException("账户已经存在");
            }
        }
        if(insert>0 && sysUserDO.getType()==3){//添加的用户是社区账号时
            //添加网格综合治理管理后台用户
            SysUserDO sysUserDOWangGe = new SysUserDO();
            BeanUtils.copyProperties(sysUserDO, sysUserDOWangGe);
            sysUserDOWangGe.setUserId(null);
            sysUserDOWangGe.setType(7);//网格综治后台
            try {
                int addWange = userDao.insert(sysUserDOWangGe);
                if(addWange!=1){
                    throw new ServiceException("新增网格综合治理管理后台用户失败");
                }
            } catch (Exception e) {
                e.printStackTrace();
                log.error("网格综合治理管理后台用户报错【{}】", e.getMessage());
                if (e.getMessage().contains("union_phone_type")) {
                    throw new ServiceException("手机号已经存在");
                } else if (e.getMessage().contains("union_account_type")) {
                    throw new ServiceException("账户已经存在");
                }
            }
        }
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
@@ -1802,4 +1825,34 @@
        userDao.updateUserArchives(userArchivesVO);
        return R.ok();
    }
    /**
     * 修改app用户密码
     * @param userInfoAppDTO    请求参数
     * @return  修改结果
     */
    @Override
    public R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO){
        if(userInfoAppDTO.getOldPassword().equals(userInfoAppDTO.getNewPassword())){
            return R.fail("新密码不可与原密码相同");
        }
        //查询用户信息
        SysUserDO userDO = userDao.selectById(userInfoAppDTO.getUserId());
        if (userDO == null) {
            return R.fail("未查询到用户信息");
        }
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        if (!passwordEncoder.matches(userInfoAppDTO.getOldPassword(),userDO.getPassword())) {
            return R.fail("原密码错误");
        }
        if(!userInfoAppDTO.getNewPassword().equals(userInfoAppDTO.getConfirmPassword())){
            return R.fail("两次输入的新密码不一致");
        }
        userDO.setPassword(passwordEncoder.encode(userInfoAppDTO.getNewPassword()));
        if (userDao.updateById(userDO) > 0) {
            return R.ok();
        } else {
            return R.fail();
        }
    }
}