From 305aebeffe0c5ff5fae977c7bffdcec09889b2e1 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期五, 23 九月 2022 17:24:45 +0800 Subject: [PATCH] update --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 63 ++++++++++++++++++++++++++++++- 1 files changed, 61 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 83cbc65..990a284 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 @@ -745,10 +745,19 @@ else { if(loginUserInfoVO.getStreetId()!=null){ loginUserInfoVO.setUserType(1); + loginUserInfoVO.setLevel(3); } else { loginUserInfoVO.setUserType(2); + loginUserInfoVO.setLevel(4); } + } + if (sysUserDO.getType().equals(11)){ + loginUserInfoVO.setLevel(5); + }else if (sysUserDO.getType().equals(12)){ + loginUserInfoVO.setLevel(2); + }else if (isNull(loginUserInfoVO.getLevel())){ + loginUserInfoVO.setLevel(1); } return R.ok(loginUserInfoVO); } @@ -3637,8 +3646,8 @@ } @Override - public R resetPassword(Integer type, String account) { - SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type)); + public R resetPassword(Integer type, String account,String appId) { + SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type).eq(SysUserDO::getAppId,appId)); if(sysUserDO!=null){ sysUserDO.setPassword("$2a$10$F/2lE2NMhKNHJfi5.FLmfu7jIr7ImRWgCTTeO6m3IRNR2V4sv8YR."); userDao.updateById(sysUserDO); @@ -3662,6 +3671,56 @@ return R.ok(); } + /** + * 三说会堂新增业务中心或专家账号 + * */ + @Override + public R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO) { + SysUserDO sysUserDO=new SysUserDO(); + //是否存在相同账号 + SysUserDO userDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", administratorsUserVO.getAccount())); + if (isNull(userDO)){ + sysUserDO.setCreateAt(new Date()); + sysUserDO.setUserId(administratorsUserVO.getUserId()); + sysUserDO.setAccount(administratorsUserVO.getAccount()); + sysUserDO.setPassword(administratorsUserVO.getPassword()); + sysUserDO.setName(administratorsUserVO.getName()); + if (nonNull(administratorsUserVO.getImageUrl())){ + sysUserDO.setImageUrl(administratorsUserVO.getImageUrl()); + } + if (nonNull(administratorsUserVO.getType())){ + sysUserDO.setType(administratorsUserVO.getType()); + } + userDao.insert(sysUserDO); + //分配权限 + SysUserRoleDO sysUserRole=new SysUserRoleDO(); + sysUserRole.setUserId(sysUserDO.getUserId()); + if (sysUserDO.getType().equals(11)){ + sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_EXPERT_ROLE)); + }else{ + sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_INDUSTRY_CENTER_ROLE)); + } + //配置权限 + sysUserRoleDAO.insert(sysUserRole); + return R.ok(); + } + return R.fail("账户名已存在"); + } + + /** + * 三说会堂后台重置密码 + * */ + @Override + public R resetPassExpertOrIndustryCenter(String account,String password) { + SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", account)); + if (nonNull(sysUserDO)){ + sysUserDO.setPassword(password); + userDao.updateById(sysUserDO); + return R.ok(); + } + return R.fail("修改失败"); + } + @Override public R getAreaAndStreet() { -- Gitblit v1.7.1