Mark 7 years ago
parent
commit
ce43c3aa2a

+ 0 - 1
src/main/java/io/renren/modules/sys/dao/BaseDao.java

@ -1,6 +1,5 @@
1 1
package io.renren.modules.sys.dao;
2 2
3
import org.apache.ibatis.annotations.Mapper;
4 3
5 4
import java.util.List;
6 5
import java.util.Map;

+ 0 - 2
src/main/java/io/renren/modules/sys/service/impl/SysMenuServiceImpl.java

@ -4,10 +4,8 @@ import io.renren.common.utils.Constant;
4 4
import io.renren.modules.sys.dao.SysMenuDao;
5 5
import io.renren.modules.sys.entity.SysMenuEntity;
6 6
import io.renren.modules.sys.service.SysMenuService;
7
import io.renren.modules.sys.service.SysRoleMenuService;
8 7
import io.renren.modules.sys.service.SysUserService;
9 8
import io.renren.common.utils.Constant.MenuType;
10
import org.apache.commons.lang.StringUtils;
11 9
import org.springframework.beans.factory.annotation.Autowired;
12 10
import org.springframework.stereotype.Service;
13 11
import org.springframework.transaction.annotation.Transactional;

+ 4 - 1
src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java

@ -121,6 +121,9 @@ public class SysUserServiceImpl implements SysUserService {
121 121
	 * 检查角色是否越权
122 122
	 */
123 123
	private void checkRole(SysUserEntity user){
124
		if(user.getRoleIdList() == null || user.getRoleIdList().size() == 0){
125
			return;
126
		}
124 127
		//如果不是超级管理员,则需要判断用户的角色是否自己创建
125 128
		if(user.getCreateUserId() == Constant.SUPER_ADMIN){
126 129
			return ;
@ -128,7 +131,7 @@ public class SysUserServiceImpl implements SysUserService {
128 131
		
129 132
		//查询用户创建的角色列表
130 133
		List<Long> roleIdList = sysRoleService.queryRoleIdList(user.getCreateUserId());
131
		
134
132 135
		//判断是否越权
133 136
		if(!roleIdList.containsAll(user.getRoleIdList())){
134 137
			throw new RRException("新增用户所选角色,不是本人创建");