From 4a215d4112258a0b4ff27e37123af683e7d77309 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Thu, 23 Oct 2025 12:13:27 +0800 Subject: [PATCH] 1 --- .../service/impl/BaseSiteServiceImpl.java | 13 +++++++++++- .../src/main/resources/application-druid.yml | 10 ++++----- .../common/core/domain/entity/SysUser.java | 11 ++++++++++ .../resources/mapper/system/SysUserMapper.xml | 18 ++++++++++++---- dl_vue/src/views/system/user/index.vue | 21 ++++++++++--------- 5 files changed, 53 insertions(+), 20 deletions(-) diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java index df30c94..04bc451 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/base/service/impl/BaseSiteServiceImpl.java @@ -3,10 +3,12 @@ package com.ruoyi.base.service.impl; import java.util.List; import com.ruoyi.base.vo.SiteVO; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -25,6 +27,8 @@ public class BaseSiteServiceImpl extends ServiceImpl i { @Autowired private BaseSiteMapper baseSiteMapper; + @Autowired + private ISysUserService sysUserService; @Override public IPage queryListPage(BaseSite pageReqVO, Page page) { @@ -45,6 +49,13 @@ public class BaseSiteServiceImpl extends ServiceImpl i //超级管理员，查所有站点 return this.list(); } - return baseSiteMapper.selectByUserId(userId); + List managerList = baseSiteMapper.selectByUserId(userId); + if(managerList.isEmpty()){ + //没有管理权限的站点,查当前用户所属的站点 + SysUser user = sysUserService.selectUserById(userId); + BaseSite site = this.getById(user.getTenantId()); + managerList.add(site); + } + return managerList; } } diff --git a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml index 95f124b..01673a8 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml +++ b/dl_admin/ruoyi-admin/src/main/resources/application-druid.yml @@ -4,12 +4,12 @@ spring: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver druid: -# # 主库数据源-点亮开发库 +# # 主库数据源-成达服务器-测试库 master: - url: jdbc:mysql://82.156.161.160:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: site - password: 123456 -# 主库数据源-客户生产服务器 + url: jdbc:mysql://8.220.74.244:3306/dl_test_site?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: dl_test_site + password: Aa123456. +# 主库数据源-成达服务器-生产库 # master: # url: jdbc:mysql://8.220.74.244:3306/dl_site_system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: site diff --git a/dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index ea2e87d..c01904d 100644 --- a/dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/dl_admin/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -101,6 +101,9 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + /** 站点唯一编码（租户id） */ + private String tenantId; + public SysUser() { @@ -364,4 +367,12 @@ public class SysUser extends BaseEntity public void setInviteId(Long inviteId) { this.inviteId = inviteId; } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } } diff --git a/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 2e81ba0..24f4e59 100644 --- a/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/dl_admin/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status,u.open_id,u.wx_open_id,u.union_id,u.invite_id,u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status,u.open_id,u.wx_open_id,u.union_id,u.invite_id,u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.tenant_id, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -61,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"