diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SysRoleServiceImpl.java index ad37167..918f8cd 100644 --- a/src/main/java/com/gaotao/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ - + package com.gaotao.modules.sys.service.impl; @@ -26,7 +26,7 @@ import java.util.Map; /** * 角色 * - * + * */ @Service("sysRoleService") public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { @@ -62,7 +62,7 @@ public class SysRoleServiceImpl extends ServiceImpl i this.save(role); //检查权限是否越权 - checkPrems(role); + //checkPrems(role); //保存角色与菜单关系 sysRoleMenuService.saveOrUpdate(role.getRoleId(), role.getMenuIdList()); @@ -74,7 +74,7 @@ public class SysRoleServiceImpl extends ServiceImpl i this.updateById(role); //检查权限是否越权 - checkPrems(role); + //checkPrems(role); //更新角色与菜单关系 sysRoleMenuService.saveOrUpdate(role.getRoleId(), role.getMenuIdList()); @@ -107,10 +107,10 @@ public class SysRoleServiceImpl extends ServiceImpl i if(role.getCreateUserId() == Constant.SUPER_ADMIN){ return ; } - + //查询用户所拥有的菜单列表 List menuIdList = sysUserService.queryAllMenuId(role.getCreateUserId()); - + //判断是否越权 if(!menuIdList.containsAll(role.getMenuIdList())){ throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200219)); diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserServiceImpl.java index f40f29f..c6af6a9 100644 --- a/src/main/java/com/gaotao/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/gaotao/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ - + package com.gaotao.modules.sys.service.impl; @@ -80,10 +80,10 @@ public class SysUserServiceImpl extends ServiceImpl i user.setSalt(salt); user.setExtUserFlag(user.getLinkedCustomerId()!=null?"Y":"N"); this.save(user); - + //检查角色是否越权 - checkRole(user); - + //checkRole(user); + //保存用户与角色关系 sysUserRoleService.saveOrUpdate(user.getUserId(), user.getRoleIdList()); } @@ -98,10 +98,10 @@ public class SysUserServiceImpl extends ServiceImpl i } user.setExtUserFlag(user.getLinkedCustomerId()!=null?"Y":"N"); this.updateById(user); - + //检查角色是否越权 - checkRole(user); - + //checkRole(user); + //保存用户与角色关系 sysUserRoleService.saveOrUpdate(user.getUserId(), user.getRoleIdList()); } @@ -118,7 +118,7 @@ public class SysUserServiceImpl extends ServiceImpl i return this.update(userEntity, new QueryWrapper().eq("user_id", userId).eq("password", password)); } - + /** * 检查角色是否越权 */ @@ -130,7 +130,7 @@ public class SysUserServiceImpl extends ServiceImpl i if(user.getCreateUserId() == Constant.SUPER_ADMIN){ return ; } - + //查询用户创建的角色列表 List roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId()); @@ -155,4 +155,4 @@ public class SysUserServiceImpl extends ServiceImpl i .orderBy(true,true,SysUserEntity::getUsername) .list(); } -} \ No newline at end of file +}