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

fix: log export issue multi-tenant

Browse Source
This commit is contained in:
simonzhangsz
2024-12-07 11:41:31 +08:00
parent ffa43ab109
commit 1f87c7a57c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/system/controller/sys_log_operate.go
View File

@@ -45,11 +45,12 @@ func (s *SysLogOperateController) List(c *gin.Context) {
// multi-tenancy, only filter user setting tenant_id // multi-tenancy, only filter user setting tenant_id
userName := ctx.LoginUserToUserName(c) userName := ctx.LoginUserToUserName(c)
dataScopeSQL := ""
if s.IsTenancyUser(userName) { if s.IsTenancyUser(userName) {
querys["operName"] = userName querys["operName"] = userName
} else {
dataScopeSQL = ctx.LoginUserToDataScopeSQL(c, "d", "u")
} }
// data := s.SysLogOperateService.SelectSysLogOperatePage(querys)
dataScopeSQL := "" // ctx.LoginUserToDataScopeSQL(c, "d", "u")
data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL) data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL)
rows := data["rows"].([]model.SysLogOperate) rows := data["rows"].([]model.SysLogOperate)
@@ -113,13 +114,15 @@ func (s *SysLogOperateController) Export(c *gin.Context) {
querys := ctx.BodyJSONMap(c) querys := ctx.BodyJSONMap(c)
querys["pageNum"] = 1 querys["pageNum"] = 1
querys["pageSize"] = 10000 querys["pageSize"] = 10000
// multi-tenancy, only filter user setting tenant_id // multi-tenancy, only filter user setting tenant_id
userName := ctx.LoginUserToUserName(c) userName := ctx.LoginUserToUserName(c)
dataScopeSQL := ""
if s.IsTenancyUser(userName) { if s.IsTenancyUser(userName) {
querys["operName"] = userName querys["operName"] = userName
} else {
dataScopeSQL = ctx.LoginUserToDataScopeSQL(c, "d", "u")
} }
// dataScopeSQL := ctx.LoginUserToDataScopeSQL(c, "d", "u")
dataScopeSQL := ""
data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL) data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL)
if parse.Number(data["total"]) == 0 { if parse.Number(data["total"]) == 0 {
// 导出数据记录为空 // 导出数据记录为空