zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-- 新版提交

Browse Source
This commit is contained in:
yc13649764453
2023-09-09 13:51:35 +08:00
parent 763e24b4e0
commit 0b193caa03
92 changed files with 3451 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/peanut/modules/sys/controller/SysRoleController.java
View File

@@ -16,6 +16,7 @@ import com.peanut.common.validator.ValidatorUtils;
import com.peanut.modules.sys.entity.SysRoleEntity;
import com.peanut.modules.sys.service.SysRoleMenuService;
import com.peanut.modules.sys.service.SysRoleService;
import com.peanut.modules.sys.service.SysUserRoleService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,6 +37,8 @@ public class SysRoleController extends AbstractController {
private SysRoleService sysRoleService;
@Autowired
private SysRoleMenuService sysRoleMenuService;
@Autowired
private SysUserRoleService sysUserRoleService;
/**
* 角色列表
@@ -44,7 +47,12 @@ public class SysRoleController extends AbstractController {
@RequiresPermissions("sys:role:list")
public R list(@RequestParam Map<String, Object> params){
//如果不是超级管理员，则只查询自己创建的角色列表
if(getUserId() != Constant.SUPER_ADMIN){
// if(getUserId() != Constant.SUPER_ADMIN){
// params.put("createUserId", getUserId());
// }
List<Long> longs = this.sysUserRoleService.queryRoleIdList(getUserId());
if(!longs.contains(1L)){
params.put("createUserId", getUserId());
}
@@ -62,9 +70,15 @@ public class SysRoleController extends AbstractController {
Map<String, Object> map = new HashMap<>();
//如果不是超级管理员，则只查询自己所拥有的角色列表
if(getUserId() != Constant.SUPER_ADMIN){
// if(getUserId() != Constant.SUPER_ADMIN){
// map.put("create_user_id", getUserId());
// }
List<Long> longs = this.sysUserRoleService.queryRoleIdList(getUserId());
if(!longs.contains(1L)){
map.put("create_user_id", getUserId());
}
List<SysRoleEntity> list = (List<SysRoleEntity>) sysRoleService.listByMap(map);
return R.ok().put("list", list);

6
src/main/java/com/peanut/modules/sys/controller/SysUserController.java
View File

@@ -50,7 +50,11 @@ public class SysUserController extends AbstractController {
@RequiresPermissions("sys:user:list")
public R list(@RequestParam Map<String, Object> params){
//只有超级管理员，才能查看所有管理员列表
if(getUserId() != Constant.SUPER_ADMIN){
// if(getUserId() != Constant.SUPER_ADMIN){
// params.put("createUserId", getUserId());
// }
List<Long> longs = this.sysUserRoleService.queryRoleIdList(getUserId());
if(!longs.contains(1L)){
params.put("createUserId", getUserId());
}
PageUtils page = sysUserService.queryPage(params);

3
src/main/java/com/peanut/modules/sys/service/impl/SysRoleServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.peanut.common.exception.RRException;
import com.peanut.common.utils.Constant;
import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.Query;
import com.peanut.modules.sys.dao.SysRoleDao;
@@ -52,7 +53,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
IPage<SysRoleEntity> page = this.page(
new Query<SysRoleEntity>().getPage(params),
new QueryWrapper<SysRoleEntity>()
new ExcludeEmptyQueryWrapper<SysRoleEntity>()
.like(StringUtils.isNotBlank(roleName),"role_name", roleName)
.eq(createUserId != null,"create_user_id", createUserId)
);

5
src/main/java/com/peanut/modules/sys/service/impl/SysUserServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.peanut.common.exception.RRException;
import com.peanut.common.utils.Constant;
import com.peanut.common.utils.ExcludeEmptyQueryWrapper;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.Query;
import com.peanut.modules.sys.dao.SysUserDao;
@@ -52,7 +53,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
IPage<SysUserEntity> page = this.page(
new Query<SysUserEntity>().getPage(params),
new QueryWrapper<SysUserEntity>()
new ExcludeEmptyQueryWrapper<SysUserEntity>()
.like(StringUtils.isNotBlank(username),"username", username)
.eq(createUserId != null,"create_user_id", createUserId)
);
@@ -137,7 +138,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
//查询用户创建的角色列表
List<Long> roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId());
//判断是否越权
// 判断是否越权
if(!roleIdList.containsAll(user.getRoleIdList())){
throw new RRException("新增用户所选角色，不是本人创建");
}