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

fix: export log empty issue

Browse Source
This commit is contained in:
simonzhangsz
2024-12-06 20:33:25 +08:00
parent 53c1866253
commit ffa43ab109
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
restagent/etc/restconf.yaml
View File

@@ -41,7 +41,7 @@ database:
password: "1000omc@kp!" password: "1000omc@kp!"
host: "127.0.0.1" host: "127.0.0.1"
port: 33066 port: 33066
name: tenants_db name: "tenants_db"
connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
backup: d:/omc.git/be.ems/restagent/database backup: d:/omc.git/be.ems/restagent/database

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

@@ -113,7 +113,13 @@ 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
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) data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL)
if parse.Number(data["total"]) == 0 { if parse.Number(data["total"]) == 0 {
// 导出数据记录为空 // 导出数据记录为空
@@ -221,8 +227,5 @@ func (s *SysLogOperateController) Export(c *gin.Context) {
func (s *SysLogOperateController) IsTenancyUser(userName string) bool { func (s *SysLogOperateController) IsTenancyUser(userName string) bool {
var tenantID []int64 var tenantID []int64
dborm.DefaultDB().Table("sys_user").Where("user_name=?", userName).Cols("tenant_id").Find(&tenantID) dborm.DefaultDB().Table("sys_user").Where("user_name=?", userName).Cols("tenant_id").Find(&tenantID)
if len(tenantID) > 0 { return (len(tenantID) > 0)
return true
}
return false
} }