OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: issue of tenant status for all features

Browse Source
This commit is contained in:
simonzhangsz
2024-09-30 16:40:37 +08:00
parent 41693db39e
commit be63431402
13 changed files with 131 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/system/model/sys_tenant.go
View File

@@ -4,7 +4,7 @@ package model
type SysTenant struct {
// 租户ID
TenantID string `json:"tenantId"`
// 父部门ID
// 父租户ID
ParentID string `json:"parentId" binding:"required"`
// 祖级列表
Ancestors string `json:"ancestors"`
@@ -16,7 +16,7 @@ type SysTenant struct {
TenancyType string `json:"tenancyType"`
// tenancy key: key of sd-sst, apn, imsi, msisdn
TenancyKey string `json:"tenancyKey"`
// 部门状态（0正常 1停用）
// 租户状态（0正常 1停用）
Status string `json:"status"`
// 删除标志（0代表存在 1代表删除）
DelFlag string `json:"delFlag"`
@@ -31,9 +31,9 @@ type SysTenant struct {
// ====== 非数据库字段属性 ======
// 子部门列表
// 子租户列表
Children []SysTenant `json:"children,omitempty"`
// 父部门名称
// 父租户名称
ParentName string `json:"parentName,omitempty"`
}

24
src/modules/system/repository/sys_log_operate.impl.go
View File

@@ -20,7 +20,7 @@ var NewSysLogOperateImpl = &SysLogOperateImpl{
l.oper_url, l.oper_ip, l.oper_location, l.oper_param, l.oper_msg, l.status, l.oper_time, l.cost_time,
t.tenant_name
from sys_log_operate l
left join sys_tenant t on t.tenant_id = l.tenant_id`,
left join sys_tenant t on t.tenant_id = l.tenant_id and t.status = 1`,
resultMap: map[string]string{
"oper_id": "OperID",
@@ -108,7 +108,7 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any, dataSc
if v, ok := query["tenantName"]; ok && v != "" {
var tenantID string
_, err := dborm.DefaultDB().Table("sys_tenant").
Where("tenant_name=?", v).Cols("tenant_id").Distinct().Get(&tenantID)
Where("tenant_name=? and status=1", v).Cols("tenant_id").Distinct().Get(&tenantID)
if err != nil {
log.Errorf("get tenant_id err => %v", err)
}
@@ -119,7 +119,7 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any, dataSc
log.Tracef("tenantName=%v, tenantID=%v", v, tenantID)
}
// 构建查询条件语句
// 构建查询条件语句, left join sys_tenant to support multi-tenancy
selectSql := r.selectSql
totalSql := "select count(oper_id) as 'total' from sys_log_operate l"
whereSql := ""
@@ -128,15 +128,17 @@ func (r *SysLogOperateImpl) SelectSysLogOperatePage(query map[string]any, dataSc
whereSql += dataScopeSQL
} else if dataScopeSQL != "" {
totalSql = `select count(o.oper_id) as 'total'
from sys_log_operate o
left join sys_user u on u.user_name = o.oper_name
left join sys_dept d on u.dept_id = d.dept_id`
from sys_log_operate o
left join sys_user u on u.user_name = o.oper_name
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id and t.status = 1 `
selectSql = `select
o.oper_id, o.title, o.business_type, o.method, o.request_method, o.operator_type, o.oper_name, o.dept_name,
o.oper_url, o.oper_ip, o.oper_location, o.oper_param, o.oper_msg, o.status, o.oper_time, o.cost_time
from sys_log_operate o
left join sys_user u on u.user_name = o.oper_name
left join sys_dept d on u.dept_id = d.dept_id`
o.oper_id, o.title, o.business_type, o.method, o.request_method, o.operator_type, o.oper_name, o.dept_name,
o.oper_url, o.oper_ip, o.oper_location, o.oper_param, o.oper_msg, o.status, o.oper_time, o.cost_time
from sys_log_operate o
left join sys_user u on u.user_name = o.oper_name
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id and t.status = 1 `
whereSql += " where 1=1" + dataScopeSQL
}

24
src/modules/system/repository/sys_tenant.impl.go
View File

@@ -15,9 +15,9 @@ import (
// 实例化数据层 SysTenantImpl 结构体
var NewSysTenantImpl = &SysTenantImpl{
selectSql: `select
t.tenant_id, t.parent_id, t.ancestors, t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status,
t.del_flag, t.create_by, t.create_time
from sys_tenant t`,
t.tenant_id, t.parent_id, t.ancestors, t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status,
t.del_flag, t.create_by, t.create_time
from sys_tenant t `,
resultMap: map[string]string{
"tenant_id": "TenantID",
@@ -103,17 +103,17 @@ func (r *SysTenantImpl) SelectTenantList(sysTenant model.SysTenant, dataScopeSQL
// SelectTenantListByRoleId 根据角色ID查询租户树信息
func (r *SysTenantImpl) SelectTenantListByRoleId(roleId string, tenantCheckStrictly bool) []string {
querySql := `select t.tenant_id as 'str' from sys_tenant d
left join sys_role_tenant rd on t.tenant_id = rt.tenant_id
where rt.role_id = ? `
querySql := `select t.tenant_id as 'str' from sys_tenant t
left join sys_role_tenant rt on t.tenant_id = rt.tenant_id
where rt.role_id = ? and t.status = 1 `
var params []any
params = append(params, roleId)
// 展开
if tenantCheckStrictly {
querySql += ` and t.tenant_id not in
(select t.parent_id from sys_tenant d
inner join sys_role_tenant rd on t.tenant_id = rt.tenant_id
and rt.role_id = ?) `
(select t.parent_id from sys_tenant t
inner join sys_role_tenant rt on t.tenant_id = rt.tenant_id
and rt.role_id = ?) `
params = append(params, roleId)
}
querySql += "order by t.parent_id, t.order_num"
@@ -138,9 +138,9 @@ func (r *SysTenantImpl) SelectTenantListByRoleId(roleId string, tenantCheckStric
// SelectTenantById 根据租户ID查询信息
func (r *SysTenantImpl) SelectTenantById(tenantId string) model.SysTenant {
querySql := `select t.tenant_id, t.parent_id, t.ancestors,
t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status,
(select tenant_name from sys_tenant where tenant_id = t.parent_id) parent_name
from sys_tenant t where t.tenant_id = ?`
t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status,
(select tenant_name from sys_tenant where tenant_id = t.parent_id and status = 1) parent_name
from sys_tenant t where t.tenant_id = ? and t.status = 1 `
results, err := datasource.RawDB("", querySql, []any{tenantId})
if err != nil {
logger.Errorf("query err => %v", err)

73
src/modules/system/repository/sys_user.impl.go
View File

@@ -16,15 +16,15 @@ import (
// 实例化数据层 SysUserImpl 结构体
var NewSysUserImpl = &SysUserImpl{
selectSql: `select
u.user_id, u.dept_id, u.tenant_id, u.user_name, u.nick_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
t.tenant_id, t.parent_id, t.ancestors, t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status as tenant_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
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id`,
u.user_id, u.dept_id, u.tenant_id, u.user_name, u.nick_name, u.user_type, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
t.tenant_id, t.parent_id, t.ancestors, t.tenant_name, t.order_num, t.tenancy_type, t.tenancy_key, t.status as tenant_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
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id `,
sysUserMap: map[string]string{
"user_id": "UserID",
@@ -146,11 +146,11 @@ func (r *SysUserImpl) convertResultRows(rows []map[string]any) []model.SysUser {
// SelectUserPage 根据条件分页查询用户列表
func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) map[string]any {
selectUserTotalSql := `select count(distinct u.user_id) as 'total'
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id`
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id `
// 查询条件拼接
var conditions []string
@@ -269,11 +269,11 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
params = append(params, roleId)
} else {
conditions = append(conditions, `(r.role_id != ? or r.role_id IS NULL)
and u.user_id not in (
select u.user_id from sys_user u
inner join sys_user_role ur on u.user_id = ur.user_id
and ur.role_id = ?
)`)
and u.user_id not in (
select u.user_id from sys_user u
inner join sys_user_role ur on u.user_id = ur.user_id
and ur.role_id = ?
)`)
params = append(params, roleId)
params = append(params, roleId)
}
@@ -295,10 +295,10 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
// 查询数量 长度为0直接返回
totalSql := `select count(distinct u.user_id) as 'total' from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id`
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id `
totalRows, err := datasource.RawDB("", totalSql+whereSql+dataScopeSQL, params)
if err != nil {
logger.Errorf("total err => %v", err)
@@ -319,13 +319,13 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
// 查询数据
querySql := `select distinct
u.user_id, u.dept_id, u.tenant_id, u.user_name, u.nick_name, u.email,
u.phonenumber, u.status, u.create_time, d.dept_name, t.tenant_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id`
u.user_id, u.dept_id, u.tenant_id, u.user_name, u.nick_name, u.email,
u.phonenumber, u.status, u.create_time, d.dept_name, t.tenant_name
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id`
querySql = querySql + whereSql + dataScopeSQL + pageSql
results, err := datasource.RawDB("", querySql, params)
if err != nil {
@@ -340,12 +340,13 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
// SelectUserList 根据条件查询用户列表
func (r *SysUserImpl) SelectUserList(sysUser model.SysUser, dataScopeSQL string) []model.SysUser {
selectUserSql := `select
u.user_id, u.dept_id, u.tenant_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_name, d.leader
t.tenant_name, t.tenancy_type, t.tenancy_key
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id`
u.user_id, u.dept_id, u.tenant_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,
u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_name, d.leader
t.tenant_name, t.tenancy_type, t.tenancy_key
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on u.tenant_id = t.tenant_id and t.status = 1`
// 查询条件拼接
var conditions []string