提交 75222966 作者: zhenjie

账号修改bug修复

上级 716a3d31
package com.mmc.iuav.user.service.impl; package com.mmc.iuav.user.service.impl;
import com.mmc.iuav.http.BizException;
import com.mmc.iuav.page.PageResult; import com.mmc.iuav.page.PageResult;
import com.mmc.iuav.response.ResultBody; import com.mmc.iuav.response.ResultBody;
import com.mmc.iuav.response.ResultEnum; import com.mmc.iuav.response.ResultEnum;
...@@ -45,22 +46,22 @@ public class BackUserAccountServiceImpl implements BackUserAccountService { ...@@ -45,22 +46,22 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
public ResultBody insertBAccount(BUserAccountVO bUserAccountVO) { public ResultBody insertBAccount(BUserAccountVO bUserAccountVO) {
if (!bUserAccountVO.getPassWord().equals(bUserAccountVO.getAlertPwd())) { if (!bUserAccountVO.getPassWord().equals(bUserAccountVO.getAlertPwd())) {
// 两次密码不一致 // 两次密码不一致
return ResultBody.error(ResultEnum.PWD_ALERT_ERROR); throw new BizException(ResultEnum.PWD_ALERT_ERROR);
} }
// 获取新增的账户名是否已经存在 // 获取新增的账户名是否已经存在
int count = backUserAccountDao.countUserAccountNo(null, bUserAccountVO.getAccountNo()); int count = backUserAccountDao.countUserAccountNo(null, bUserAccountVO.getAccountNo());
if (count > 0) { if (count > 0) {
return ResultBody.error(ResultEnum.ADD_USER_ACCOUNT_NAME_EXISTS); throw new BizException(ResultEnum.ADD_USER_ACCOUNT_NAME_EXISTS);
} }
if (bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) { if (bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) {
return ResultBody.error(ResultEnum.ONLY_ONE_ADMIN_ERROR); throw new BizException(ResultEnum.ONLY_ONE_ADMIN_ERROR);
} }
roleDao.insertUserRoleRel(bUserAccountVO.getId(), bUserAccountVO.getRoleId()); roleDao.insertUserRoleRel(bUserAccountVO.getId(), bUserAccountVO.getRoleId());
BackUserAccountDO backUserAccountDO = new BackUserAccountDO(bUserAccountVO); BackUserAccountDO backUserAccountDO = new BackUserAccountDO(bUserAccountVO);
try { try {
backUserAccountDO.setPassword(PwdUtil.securityPwd(bUserAccountVO.getPassWord())); backUserAccountDO.setPassword(PwdUtil.securityPwd(bUserAccountVO.getPassWord()));
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
return ResultBody.error(ResultEnum.PWD_CREATE_ERROR); throw new BizException(ResultEnum.PWD_CREATE_ERROR);
} }
backUserAccountDao.insertBackUserAccount(backUserAccountDO); backUserAccountDao.insertBackUserAccount(backUserAccountDO);
// 添加单位信息 // 添加单位信息
...@@ -81,7 +82,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService { ...@@ -81,7 +82,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
// 如果传入的名字不为空,就查找数据库,看名字是否重复 // 如果传入的名字不为空,就查找数据库,看名字是否重复
int count = backUserAccountDao.countUserAccountNo(bUserAccountVO.getId(), bUserAccountVO.getAccountNo()); int count = backUserAccountDao.countUserAccountNo(bUserAccountVO.getId(), bUserAccountVO.getAccountNo());
if (count > 0) { if (count > 0) {
return ResultBody.error(ResultEnum.UPDATE_USER_ACCOUNT_REPEAT); throw new BizException(ResultEnum.UPDATE_USER_ACCOUNT_REPEAT);
} }
} }
BackUserAccountDO userAccountDO = new BackUserAccountDO(bUserAccountVO); BackUserAccountDO userAccountDO = new BackUserAccountDO(bUserAccountVO);
...@@ -94,15 +95,15 @@ public class BackUserAccountServiceImpl implements BackUserAccountService { ...@@ -94,15 +95,15 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
companyService.updateCompanyBackUser(companyBackUserDO); companyService.updateCompanyBackUser(companyBackUserDO);
} }
if (bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) { if (bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) {
return ResultBody.error(ResultEnum.ONLY_ONE_ADMIN_ERROR); throw new BizException(ResultEnum.ONLY_ONE_ADMIN_ERROR);
} }
// 不能修改自己的角色 // 不能修改自己的角色
if (loginSuccessDTO.getUserAccountId().toString().equals(bUserAccountVO.getId().toString())) { if (loginSuccessDTO.getUserAccountId().toString().equals(bUserAccountVO.getId().toString())) {
return ResultBody.error(ResultEnum.UPDATE_OWNER_ROLE_ERROR); throw new BizException(ResultEnum.UPDATE_OWNER_ROLE_ERROR);
} }
// 不能修改admin账号的角色 // 不能修改admin账号的角色
if (bUserAccountVO.getId().equals(1) && !bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) { if (bUserAccountVO.getId().equals(1) && !bUserAccountVO.getRoleId().equals(RoleEnums.ADMIN.getId())) {
return ResultBody.error(ResultEnum.UPDATE_ADMIN_ROLE_ERROR); throw new BizException(ResultEnum.UPDATE_ADMIN_ROLE_ERROR);
} }
roleDao.updateUserRoleRel(bUserAccountVO.getId(), bUserAccountVO.getRoleId()); roleDao.updateUserRoleRel(bUserAccountVO.getId(), bUserAccountVO.getRoleId());
return ResultBody.success(); return ResultBody.success();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论