fix: log export issue multi-tenant
This commit is contained in:
@@ -45,11 +45,12 @@ func (s *SysLogOperateController) List(c *gin.Context) {
|
||||
|
||||
// multi-tenancy, only filter user setting tenant_id
|
||||
userName := ctx.LoginUserToUserName(c)
|
||||
dataScopeSQL := ""
|
||||
if s.IsTenancyUser(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)
|
||||
rows := data["rows"].([]model.SysLogOperate)
|
||||
|
||||
@@ -113,13 +114,15 @@ func (s *SysLogOperateController) Export(c *gin.Context) {
|
||||
querys := ctx.BodyJSONMap(c)
|
||||
querys["pageNum"] = 1
|
||||
querys["pageSize"] = 10000
|
||||
|
||||
// multi-tenancy, only filter user setting tenant_id
|
||||
userName := ctx.LoginUserToUserName(c)
|
||||
dataScopeSQL := ""
|
||||
if s.IsTenancyUser(userName) {
|
||||
querys["operName"] = userName
|
||||
} else {
|
||||
dataScopeSQL = ctx.LoginUserToDataScopeSQL(c, "d", "u")
|
||||
}
|
||||
// dataScopeSQL := ctx.LoginUserToDataScopeSQL(c, "d", "u")
|
||||
dataScopeSQL := ""
|
||||
data := s.SysLogOperateService.SelectSysLogOperatePage(querys, dataScopeSQL)
|
||||
if parse.Number(data["total"]) == 0 {
|
||||
// 导出数据记录为空
|
||||
|
||||
Reference in New Issue
Block a user