全局租户id

master
xiaoning 6 days ago
parent 73520984c4
commit a587591c0f

@ -1,18 +1,18 @@
package com.ruoyi.common.core.domain.model;
import java.util.Collection;
import java.util.Set;
import com.alibaba.fastjson.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
import lombok.Getter;
import lombok.Setter;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import com.alibaba.fastjson.annotation.JSONField;
import com.ruoyi.common.core.domain.entity.SysUser;
import java.util.Collection;
import java.util.Set;
/**
*
*
*
* @author ruoyi
*/
public class LoginUser implements UserDetails
@ -124,6 +124,7 @@ public class LoginUser implements UserDetails
this.deptId = deptId;
this.user = user;
this.permissions = permissions;
this.nowTenantId=user.getTenantId();
}
@JSONField(serialize = false)
@ -151,7 +152,7 @@ public class LoginUser implements UserDetails
/**
* ,
*
*
* @return
*/
@JSONField(serialize = false)
@ -163,7 +164,7 @@ public class LoginUser implements UserDetails
/**
* (),
*
*
* @return
*/
@JSONField(serialize = false)
@ -175,7 +176,7 @@ public class LoginUser implements UserDetails
/**
* ,
*
*
* @return
*/
@JSONField(serialize = false)

@ -5,17 +5,27 @@ import org.apache.commons.lang3.builder.ToStringStyle;
/**
* sys_role_menu
*
*
* @author ruoyi
*/
public class SysRoleMenu
{
/** 角色ID */
private Long roleId;
/** 菜单ID */
private Long menuId;
private String tenantId;
public String getTenantId() {
return tenantId;
}
public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}
public Long getRoleId()
{
return roleId;

@ -1,8 +1,9 @@
package com.ruoyi.system.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.common.core.domain.entity.SysMenu;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
@ -32,7 +33,7 @@ public interface SysMenuMapper
* @param menu
* @return
*/
public List<SysMenu> selectMenuListByUserId(SysMenu menu);
public List<SysMenu> selectMenuListByUserId(@Param("userId")Long userId, @Param("tenantId") String tenantId);
/**
* ID
@ -40,7 +41,7 @@ public interface SysMenuMapper
* @param userId ID
* @return
*/
public List<String> selectMenuPermsByUserId(Long userId);
public List<String> selectMenuPermsByUserId( @Param("userId")Long userId, @Param("tenantId") String tenantId);
/**
* ID
@ -59,7 +60,7 @@ public interface SysMenuMapper
/**
* ID
*
*
* @param roleId ID
* @param menuCheckStrictly
* @return

@ -1,15 +1,5 @@
package com.ruoyi.system.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
@ -24,10 +14,15 @@ import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -46,7 +41,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param userId ID
* @return
*/
@ -58,7 +53,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -66,6 +61,7 @@ public class SysMenuServiceImpl implements ISysMenuService
public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
{
List<SysMenu> menuList = null;
menu.setVisible("0");
// 管理员显示所有菜单信息
if (SysUser.isAdmin(userId))
{
@ -73,22 +69,23 @@ public class SysMenuServiceImpl implements ISysMenuService
}
else
{
menu.getParams().put("userId", userId);
menuList = menuMapper.selectMenuListByUserId(menu);
// menu.getParams().put("userId", userId);
menuList = menuMapper.selectMenuListByUserId(userId,SecurityUtils.getLoginUser().getNowTenantId());
}
return menuList;
}
/**
* ID
*
*
* @param userId ID
* @return
*/
@Override
public Set<String> selectMenuPermsByUserId(Long userId)
{
List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
List<String> perms = menuMapper.selectMenuPermsByUserId(userId,SecurityUtils.getLoginUser().getNowTenantId());
Set<String> permsSet = new HashSet<>();
for (String perm : perms)
{
@ -102,7 +99,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param userId
* @return
*/
@ -123,7 +120,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -136,7 +133,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menus
* @return
*/
@ -193,7 +190,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menus
* @return
*/
@ -225,7 +222,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menus
* @return
*/
@ -238,7 +235,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param menuId ID
* @return
*/
@ -250,7 +247,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menuId ID
* @return
*/
@ -263,7 +260,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* 使
*
*
* @param menuId ID
* @return
*/
@ -276,7 +273,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -288,7 +285,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -300,7 +297,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menuId ID
* @return
*/
@ -312,7 +309,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -330,7 +327,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -347,7 +344,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -375,7 +372,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -399,7 +396,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -411,7 +408,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param menu
* @return
*/
@ -422,7 +419,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* parent_view
*
*
* @param menu
* @return
*/
@ -433,7 +430,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
* ID
*
*
* @param list
* @param parentId ID
* @return String
@ -456,7 +453,7 @@ public class SysMenuServiceImpl implements ISysMenuService
/**
*
*
*
* @param list
* @param t
*/

@ -24,7 +24,7 @@ import java.util.*;
/**
*
*
*
* @author ruoyi
*/
@Service
@ -44,7 +44,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -52,12 +52,13 @@ public class SysRoleServiceImpl implements ISysRoleService
@DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role)
{
role.setTenantId(SecurityUtils.getLoginUser().getNowTenantId());
return roleMapper.selectRoleList(role);
}
/**
* ID
*
*
* @param userId ID
* @return
*/
@ -82,7 +83,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param userId ID
* @return
*/
@ -103,7 +104,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @return
*/
@Override
@ -114,7 +115,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param userId ID
* @return ID
*/
@ -126,7 +127,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -138,7 +139,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -156,7 +157,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -174,21 +175,28 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
*/
@Override
public void checkRoleAllowed(SysRole role)
{
if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
if (StringUtils.isNotNull(role.getRoleId()))
{
throw new ServiceException("不允许操作超级管理员角色");
if (role.isAdmin()){
throw new ServiceException("不允许操作超级管理员角色");
}
if (!SecurityUtils.getLoginUser().getUser().isAdmin()&&role.getRoleId()<=108l){
throw new ServiceException("没有操作基础角色权限");
}
}
}
/**
*
*
*
* @param roleId id
*/
@Override
@ -208,7 +216,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID使
*
*
* @param roleId ID
* @return
*/
@ -220,7 +228,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -235,7 +243,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -252,7 +260,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -264,7 +272,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
* @return
*/
@ -282,7 +290,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param role
*/
public int insertRoleMenu(SysRole role)
@ -295,6 +303,7 @@ public class SysRoleServiceImpl implements ISysRoleService
SysRoleMenu rm = new SysRoleMenu();
rm.setRoleId(role.getRoleId());
rm.setMenuId(menuId);
rm.setTenantId(role.getTenantId());
list.add(rm);
}
if (list.size() > 0)
@ -330,7 +339,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
* ID
*
*
* @param roleId ID
* @return
*/
@ -347,7 +356,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param roleIds ID
* @return
*/
@ -373,7 +382,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param userRole
* @return
*/
@ -385,7 +394,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param roleId ID
* @param userIds ID
* @return
@ -398,7 +407,7 @@ public class SysRoleServiceImpl implements ISysRoleService
/**
*
*
*
* @param roleId ID
* @param userIds ID
* @return

@ -28,10 +28,10 @@
</resultMap>
<sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
from sys_menu
</sql>
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
<where>
@ -47,32 +47,25 @@
</where>
order by parent_id, order_num
</select>
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
<select id="selectMenuListByUserId" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role ro on ur.role_id = ro.role_id
where ur.user_id = #{params.userId}
<if test="menuName != null and menuName != ''">
AND m.menu_name like concat('%', #{menuName}, '%')
</if>
<if test="visible != null and visible != ''">
AND m.visible = #{visible}
</if>
<if test="status != null and status != ''">
AND m.status = #{status}
</if>
where ur.user_id = #{userId}
and m.visible='0'
AND rm.tenantId = #{tenantId}
order by m.parent_id, m.order_num
</select>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
@ -83,7 +76,7 @@
where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByRoleId" resultType="Integer">
select m.menu_id
from sys_menu m
@ -94,7 +87,7 @@
</if>
order by m.parent_id, m.order_num
</select>
<select id="selectMenuPerms" resultType="String">
select distinct m.perms
from sys_menu m
@ -108,23 +101,24 @@
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
left join sys_role r on r.role_id = ur.role_id
where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
where m.status = '0' and r.status = '0' and ur.user_id = #{userId} and rm.tenant_id=#{tenantId}
</select>
<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_id = #{menuId}
</select>
<select id="hasChildByMenuId" resultType="Integer">
select count(1) from sys_menu where parent_id = #{menuId}
select count(1) from sys_menu where parent_id = #{menuId}
</select>
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select>
<update id="updateMenu" parameterType="SysMenu">
update sys_menu
<set>
@ -187,9 +181,9 @@
sysdate()
)
</insert>
<delete id="deleteMenuById" parameterType="Long">
delete from sys_menu where menu_id = #{menuId}
</delete>
</mapper>
</mapper>

@ -20,16 +20,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectRoleVo">
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
r.status, r.del_flag, r.create_time, r.remark
r.status, r.del_flag, r.create_time, r.remark
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
left join sys_dept d on u.dept_id = d.dept_id
</sql>
<select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.del_flag = '0'
@ -51,20 +51,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
and (r.tenant_id=1 or r.tenant_id=#{tenantId})
<!-- 数据范围过滤 -->
${params.dataScope}
order by r.role_sort
</select>
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0' and ur.user_id = #{userId}
</select>
<select id="selectRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
</select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
select r.role_id
from sys_role r
@ -72,27 +73,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user u on u.user_id = ur.user_id
where u.user_id = #{userId}
</select>
<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.role_id = #{roleId}
</select>
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0' and u.user_name = #{userName}
</select>
<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.role_name=#{roleName} limit 1
</select>
<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.role_key=#{roleKey} limit 1
</select>
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
insert into sys_role(
<if test="roleId != null and roleId != 0">role_id,</if>
@ -105,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="tenantId != null">tenant_id,</if>
create_time
)values(
<if test="roleId != null and roleId != 0">#{roleId},</if>
@ -117,10 +119,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="tenantId != null">#{tenantId},</if>
sysdate()
)
</insert>
<update id="updateRole" parameterType="SysRole">
update sys_role
<set>
@ -137,16 +140,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</set>
where role_id = #{roleId}
</update>
<delete id="deleteRoleById" parameterType="Long">
update sys_role set del_flag = '2' where role_id = #{roleId}
</delete>
<delete id="deleteRoleByIds" parameterType="Long">
update sys_role set del_flag = '2' where role_id in
<foreach collection="array" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</foreach>
</delete>
</mapper>
</mapper>

Loading…
Cancel
Save