From 1f87c7a57cc2806a16bf8e35c211bb13e44f9d01 Mon Sep 17 00:00:00 2001
From: simonzhangsz <15231584+simonzhangsz@user.noreply.gitee.com>
Date: Sat, 7 Dec 2024 11:41:31 +0800
Subject: [PATCH] fix: log export issue multi-tenant

---
 src/modules/system/controller/sys_log_operate.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/system/controller/sys_log_operate.go b/src/modules/system/controller/sys_log_operate.go
index 331d3a4f..49fb0ae9 100644
--- a/src/modules/system/controller/sys_log_operate.go
+++ b/src/modules/system/controller/sys_log_operate.go
@@ -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 {
 		// 导出数据记录为空