From 0248c7d0f70475dbd5f75a78bf0c5c6b4065d038 Mon Sep 17 00:00:00 2001 From: zhengjie Date: Fri, 1 Mar 2019 12:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4=E7=9A=84?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/domain/vo/MenuMetaVo.java | 1 - .../service/impl/PermissionServiceImpl.java | 14 ---------- .../system/service/impl/RoleServiceImpl.java | 26 ------------------- .../system/service/impl/UserServiceImpl.java | 13 ---------- 4 files changed, 54 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java index f465adb9..4c012f96 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java @@ -2,7 +2,6 @@ package me.zhengjie.modules.system.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; - import java.io.Serializable; /** diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java index ecd357e9..cf7f5337 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/PermissionServiceImpl.java @@ -48,13 +48,6 @@ public class PermissionServiceImpl implements PermissionService { @Transactional(rollbackFor = Exception.class) public void update(Permission resources) { - /** - * 根据实际需求修改 - */ - if(resources.getId().equals(1L)){ - throw new BadRequestException("该权限不能被修改"); - } - Optional optionalPermission = permissionRepository.findById(resources.getId()); ValidationUtil.isNull(optionalPermission,"Permission","id",resources.getId()); @@ -75,13 +68,6 @@ public class PermissionServiceImpl implements PermissionService { @Override @Transactional(rollbackFor = Exception.class) public void delete(Long id) { - /** - * 根据实际需求修改 - */ - if(id.equals(1L)){ - throw new BadRequestException("该权限不能被删除"); - } - List permissionList = permissionRepository.findByPid(id); for (Permission permission : permissionList) { permissionRepository.delete(permission); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index 2187a903..cd88b28c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -48,14 +48,6 @@ public class RoleServiceImpl implements RoleService { @Transactional(rollbackFor = Exception.class) public void update(Role resources) { - /** - * 根据实际需求修改 - */ - if(resources.getId().equals(1L)){ - throw new BadRequestException("该角色不能被修改"); - } - - Optional optionalRole = roleRepository.findById(resources.getId()); ValidationUtil.isNull(optionalRole,"Role","id",resources.getId()); @@ -74,12 +66,6 @@ public class RoleServiceImpl implements RoleService { @Override public void updatePermission(Role resources, RoleDTO roleDTO) { - /** - * 根据实际需求修改 - */ - if(resources.getId().equals(1L)){ - throw new BadRequestException("该角色不可操作"); - } Role role = roleMapper.toEntity(roleDTO); role.setPermissions(resources.getPermissions()); roleRepository.save(role); @@ -87,12 +73,6 @@ public class RoleServiceImpl implements RoleService { @Override public void updateMenu(Role resources, RoleDTO roleDTO) { - /** - * 根据实际需求修改 - */ - if(resources.getId().equals(1L)){ - throw new BadRequestException("该角色不可操作"); - } Role role = roleMapper.toEntity(roleDTO); role.setMenus(resources.getMenus()); roleRepository.save(role); @@ -101,12 +81,6 @@ public class RoleServiceImpl implements RoleService { @Override @Transactional(rollbackFor = Exception.class) public void delete(Long id) { - /** - * 根据实际需求修改 - */ - if(id.equals(1L)){ - throw new BadRequestException("该角色不能被删除"); - } roleRepository.deleteById(id); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index 6b2d1edf..eba91138 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -68,13 +68,6 @@ public class UserServiceImpl implements UserService { @Transactional(rollbackFor = Exception.class) public void update(User resources) { - /** - * 根据实际需求修改 - */ - if(resources.getId().equals(1L)){ - throw new BadRequestException("该账号不能被修改"); - } - Optional userOptional = userRepository.findById(resources.getId()); ValidationUtil.isNull(userOptional,"User","id",resources.getId()); @@ -106,12 +99,6 @@ public class UserServiceImpl implements UserService { @Override @Transactional(rollbackFor = Exception.class) public void delete(Long id) { - /** - * 根据实际需求修改 - */ - if(id.equals(1L)){ - throw new BadRequestException("该账号不能被删除"); - } userRepository.deleteById(id); }