菜单增加用户权限

user_center/src/main/java/com/huaxu/dao/MenuMapper.java

@@ -31,7 +31,7 @@ public interface MenuMapper extends BaseMapper<MenuEntity> {
 
     List<MenuEntity> findTenantList(MenuEntity menuEntity);
 
-    List<MenuEntity> findUserList(MenuEntity menuEntity);
+    List<MenuEntity> findUserList(@Param("name") String name,@Param("tenantId") String tenantId,@Param(value = "userId")Integer userId);
 
     List<MenuEntity> findMenuByParentIds(@Param("Ids") List<Long> Ids);
 

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -61,7 +61,9 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		Integer userId = currentUser.getId();
 		//-999租户管理员  -9999超级管理员  2普通用户
 		String userType = currentUser.getType();
-		menuEntity.setTenantId(currentUser.getTenantId());
+		String tenantId = currentUser.getTenantId();
+		String name = menuEntity.getName();
+		menuEntity.setTenantId(tenantId);
 		List<MenuEntity> menuEntities = new ArrayList<>();
 		switch (userType) {
 			case "-9999"://超级管理员查询所有系统菜单
@@ -71,7 +73,7 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 				menuEntities = menuMapper.findTenantList(menuEntity);
 				break;
 			default://普通用户按角色查询租户菜单
-				menuEntities = menuMapper.findUserList(menuEntity);
+				menuEntities = menuMapper.findUserList(name,tenantId,userId);
 				break;
 		}
 

user_center/src/main/resources/mapper/MenuMapper.xml

@@ -193,7 +193,7 @@
             and a.tenant_id = #{tenantId}
         </if>
         <where>
-            a.status=1  and  userrole.status=1  and b.is_tenant=1
+            a.status=1  and  userrole.status=1  and b.is_tenant=1  and userrole.user_id=#{userId}
             <if test="name != null  and name != ''">
                 and a.MENU_NAME LIKE concat('%',#{name},'%')
             </if>