lbqms.git - Gitblit

			@@ -102,14 +102,13 @@
			*/
			@Override
			public List<SysRoleVo> selectRolesAuthByUserId(Long userId) {
			List<SysRoleVo> userRoles = baseMapper.selectRolePermissionByUserId(userId);
			List<SysRoleVo> userRoles = baseMapper.selectRolesByUserId(userId);
			List<SysRoleVo> roles = selectRoleAll();
			// 使用HashSet提高查找效率
			Set<Long> userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId);
			for (SysRoleVo role : roles) {
			for (SysRoleVo userRole : userRoles) {
			if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) {
			role.setFlag(true);
			break;
			}
			if (userRoleIds.contains(role.getRoleId())) {
			role.setFlag(true);
			}
			}
			return roles;
			@@ -123,7 +122,7 @@
			*/
			@Override
			public Set<String> selectRolePermissionByUserId(Long userId) {
			List<SysRoleVo> perms = baseMapper.selectRolePermissionByUserId(userId);
			List<SysRoleVo> perms = baseMapper.selectRolesByUserId(userId);
			Set<String> permsSet = new HashSet<>();
			for (SysRoleVo perm : perms) {
			if (ObjectUtil.isNotNull(perm)) {
			@@ -294,6 +293,10 @@
			@Transactional(rollbackFor = Exception.class)
			public int updateRole(SysRoleBo bo) {
			SysRole role = MapstructUtils.convert(bo, SysRole.class);

			if (UserConstants.ROLE_DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) {
			throw new ServiceException("角色已分配，不能禁用!");
			}
			// 修改角色信息
			baseMapper.updateById(role);
			// 删除角色与菜单关联
			@@ -417,7 +420,7 @@
			roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, ids));
			// 删除角色与部门关联
			roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().in(SysRoleDept::getRoleId, ids));
			return baseMapper.deleteBatchIds(ids);
			return baseMapper.deleteByIds(ids);
			}

			/**