From ffa43ab10964ed034e90cb8cc6c49335ec67c3d8 Mon Sep 17 00:00:00 2001 From: simonzhangsz <15231584+simonzhangsz@user.noreply.gitee.com> Date: Fri, 6 Dec 2024 20:33:25 +0800 Subject: [PATCH] fix: export log empty issue --- restagent/etc/restconf.yaml | 2 +- src/modules/system/controller/sys_log_operate.go | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 5664e573..1bef93f4 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -41,7 +41,7 @@ database: password: "1000omc@kp!" host: "127.0.0.1" port: 33066 - name: tenants_db + name: "tenants_db" connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: d:/omc.git/be.ems/restagent/database diff --git a/src/modules/system/controller/sys_log_operate.go b/src/modules/system/controller/sys_log_operate.go index 1bfabd00..331d3a4f 100644 --- a/src/modules/system/controller/sys_log_operate.go +++ b/src/modules/system/controller/sys_log_operate.go @@ -113,7 +113,13 @@ func (s *SysLogOperateController) Export(c *gin.Context) { querys := ctx.BodyJSONMap(c) querys["pageNum"] = 1 querys["pageSize"] = 10000 - dataScopeSQL := ctx.LoginUserToDataScopeSQL(c, "d", "u") + // multi-tenancy, only filter user setting tenant_id + userName := ctx.LoginUserToUserName(c) + if s.IsTenancyUser(userName) { + querys["operName"] = userName + } + // dataScopeSQL := ctx.LoginUserToDataScopeSQL(c, "d", "u") + dataScopeSQL := "" data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL) if parse.Number(data["total"]) == 0 { // 导出数据记录为空 @@ -221,8 +227,5 @@ func (s *SysLogOperateController) Export(c *gin.Context) { func (s *SysLogOperateController) IsTenancyUser(userName string) bool { var tenantID []int64 dborm.DefaultDB().Table("sys_user").Where("user_name=?", userName).Cols("tenant_id").Find(&tenantID) - if len(tenantID) > 0 { - return true - } - return false + return (len(tenantID) > 0) }