cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
moxiangrong
2024-02-28 19:10:55 +08:00
parent bed9e338ad
commit 53c6e29f1b
6 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yshop-module-system/yshop-module-system-biz/src/main/java/co/yixiang/yshop/module/system/service/permission/RoleServiceImpl.java
View File

@ -251,9 +251,9 @@ public class RoleServiceImpl implements RoleService {
if (roleDO == null) {
throw exception(ROLE_NOT_EXISTS);
}
// 内置角色，不允许删除
if (RoleTypeEnum.SYSTEM.getType().equals(roleDO.getType())) {
throw exception(ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE);
// 管理员角色，不允许操作
if (roleDO.getId() == 1) {
throw exception(ADMIN_ROLE_CAN_NOT_UPDATE);
}
}

7
yshop-module-system/yshop-module-system-biz/src/main/java/co/yixiang/yshop/module/system/service/user/AdminUserServiceImpl.java
View File

@ -19,6 +19,7 @@ import co.yixiang.yshop.module.system.dal.dataobject.dept.UserPostDO;
import co.yixiang.yshop.module.system.dal.dataobject.user.AdminUserDO;
import co.yixiang.yshop.module.system.dal.mysql.dept.UserPostMapper;
import co.yixiang.yshop.module.system.dal.mysql.user.AdminUserMapper;
import co.yixiang.yshop.module.system.enums.permission.UserTypeEnum;
import co.yixiang.yshop.module.system.service.dept.DeptService;
import co.yixiang.yshop.module.system.service.dept.PostService;
import co.yixiang.yshop.module.system.service.permission.PermissionService;
@ -195,6 +196,12 @@ public class AdminUserServiceImpl implements AdminUserService {
public void deleteUser(Long id) {
// 校验用户存在
validateUserExists(id);
// 管理员不能删除
AdminUserDO user = userMapper.selectById(id);
if(UserTypeEnum.ADMIN.getUsername().equals(user.getUsername())){
throw exception(ADMIN_USER_NOT_DELETE);
}
// 删除用户
userMapper.deleteById(id);
// 删除用户关联数据