全局租户id

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -1,14 +1,14 @@
 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;
 
 /**
  * 登录用户身份权限
@@ -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)

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -16,6 +16,16 @@ public class SysRoleMenu
     /** 菜单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;

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -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查询菜单

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -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,6 +14,11 @@ 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;
 
 /**
  * 菜单 业务层处理
@@ -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,8 +69,8 @@ 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;
     }
@@ -88,7 +84,8 @@ public class SysMenuServiceImpl implements ISysMenuService
     @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)
         {

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -52,6 +52,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @DataScope(deptAlias = "d")
     public List<SysRole> selectRoleList(SysRole role)
     {
+        role.setTenantId(SecurityUtils.getLoginUser().getNowTenantId());
         return roleMapper.selectRoleList(role);
     }
 
@@ -180,10 +181,17 @@ public class SysRoleServiceImpl implements ISysRoleService
     @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("没有操作基础角色权限");
+            }
         }
+
+
     }
 
     /**
@@ -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)

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -54,22 +54,15 @@
 		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>
 
@@ -108,7 +101,8 @@
 			 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">

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -51,6 +51,7 @@ 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
@@ -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,6 +119,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">#{createBy},</if>
+ 			<if test="tenantId != null">#{tenantId},</if>
  			sysdate()
  		)
 	</insert>