|
@@ -58,8 +58,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
@Override
|
|
@Override
|
|
public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
|
|
public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
|
|
- Page<SysRole> page = new Page<>(pageNumber, pageSize);
|
|
|
|
- return this.baseMapper.listPage(page, schoolId, SystemConstant.translateSpecificSign(name), enable);
|
|
|
|
|
|
+ return this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, SystemConstant.translateSpecificSign(name), enable);
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional
|
|
@Transactional
|
|
@@ -162,7 +161,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
public boolean enable(SysRole role) {
|
|
public boolean enable(SysRole role) {
|
|
UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>();
|
|
UpdateWrapper<SysRole> updateWrapper = new UpdateWrapper<>();
|
|
updateWrapper.lambda().set(SysRole::getEnable, role.getEnable()).eq(SysRole::getId, role.getId());
|
|
updateWrapper.lambda().set(SysRole::getEnable, role.getEnable()).eq(SysRole::getId, role.getId());
|
|
- return this.update(updateWrapper);
|
|
|
|
|
|
+ this.update(updateWrapper);
|
|
|
|
+ cacheService.roleCache(role.getId());
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional
|
|
@Transactional
|
|
@@ -173,10 +174,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
|
|
if (userRoleList != null && userRoleList.size() > 0) {
|
|
if (userRoleList != null && userRoleList.size() > 0) {
|
|
throw ExceptionResultEnum.ERROR.exception("用户绑定,不能删除");
|
|
throw ExceptionResultEnum.ERROR.exception("用户绑定,不能删除");
|
|
}
|
|
}
|
|
-
|
|
|
|
//删除权限
|
|
//删除权限
|
|
sysRolePrivilegeService.removeByRoleId(id);
|
|
sysRolePrivilegeService.removeByRoleId(id);
|
|
- return this.removeById(id);
|
|
|
|
|
|
+ this.removeById(id);
|
|
|
|
+ cacheService.removeRoleCache(id);
|
|
|
|
+ cacheService.removeRolePrivilegeCache(id);
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|