From 47fbda1240659bca4c6cbb890dac67394611d038 Mon Sep 17 00:00:00 2001
From: wangxinyu <wangxinyu4585@163.com>
Date: Tue, 24 Dec 2024 15:37:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=B8=BB=E6=92=AD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=98=B5=E7=A7=B0=E5=AE=A1=E6=A0=B8-op=20=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/proto/textaudittask/proto/textaudittask_op.go | 1 +
 app/mix/dao/mongo.go                              | 9 ++++++++-
 app/mix/service/logic/audit_task_decorator.go     | 2 +-
 app/mix/service/logic/textaudittask.go            | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/api/proto/textaudittask/proto/textaudittask_op.go b/api/proto/textaudittask/proto/textaudittask_op.go
index 1028960d..53f03921 100644
--- a/api/proto/textaudittask/proto/textaudittask_op.go
+++ b/api/proto/textaudittask/proto/textaudittask_op.go
@@ -57,6 +57,7 @@ type OpListReq struct {
 	AssociativeTableColumn *string `json:"associative_table_column"`
 	BatchId                *string `json:"batch_id"`
 	Status                 *int64  `json:"status"`
+	Role                   *int64  `json:"role"`
 	Offset                 int     `json:"offset"`
 	Limit                  int     `json:"limit"`
 	Sort                   string
diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go
index 1eedd9a2..b8712491 100644
--- a/app/mix/dao/mongo.go
+++ b/app/mix/dao/mongo.go
@@ -3869,6 +3869,9 @@ func (m *Mongo) GetTextAuditTaskList(ctx *gin.Context, req *textaudittaskproto.O
 	if req.Status != nil {
 		query["status"] = util.DerefInt64(req.Status)
 	}
+	if req.Role != nil {
+		query["role"] = util.DerefInt64(req.Role)
+	}
 	if req.NotAlignedOpt != 0 {
 		query["is_aligned"] = qmgo.M{
 			"$ne": consts.TextAuditIsAligned_Yes,
@@ -3886,7 +3889,7 @@ func (m *Mongo) GetTextAuditTaskList(ctx *gin.Context, req *textaudittaskproto.O
 	return list, err
 }
 
-func (m *Mongo) GetTextAuditTaskListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
+func (m *Mongo) GetTextAuditTaskListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, role *int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
 	list := make([]*dbstruct.TextAuditTask, 0)
 
 	if len(databases) != len(tableNames) {
@@ -3902,6 +3905,10 @@ func (m *Mongo) GetTextAuditTaskListByCollectionInfos(ctx *gin.Context, database
 		"del_flag": 0,
 	}
 
+	if role != nil {
+		query["role"] = util.DerefInt64(role)
+	}
+
 	orClause := make([]qmgo.M, 0)
 	for i := range databases {
 		orClause = append(orClause, qmgo.M{
diff --git a/app/mix/service/logic/audit_task_decorator.go b/app/mix/service/logic/audit_task_decorator.go
index 87126ad3..1ac46d48 100644
--- a/app/mix/service/logic/audit_task_decorator.go
+++ b/app/mix/service/logic/audit_task_decorator.go
@@ -87,7 +87,7 @@ func (p *TextAuditTaskDecorator) OpList(ctx *gin.Context, req *textaudittaskprot
 				databases = append(databases, collectionInfo.Database)
 				tableNames = append(tableNames, collectionInfo.TableName)
 			}
-			return p.TextAuditTask.OpListByCollectionInfos(ctx, databases, tableNames, util.DerefInt64(req.Status), req.Offset, req.Limit)
+			return p.TextAuditTask.OpListByCollectionInfos(ctx, databases, tableNames, util.DerefInt64(req.Status), req.Role, req.Offset, req.Limit)
 		}
 	}
 	return queryFunc(ctx, req)
diff --git a/app/mix/service/logic/textaudittask.go b/app/mix/service/logic/textaudittask.go
index 66c697e3..74973c20 100644
--- a/app/mix/service/logic/textaudittask.go
+++ b/app/mix/service/logic/textaudittask.go
@@ -65,8 +65,8 @@ func (p *TextAuditTask) OpList(ctx *gin.Context, req *textaudittaskproto.OpListR
 	return list, nil
 }
 
-func (p *TextAuditTask) OpListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
-	list, err := p.store.GetTextAuditTaskListByCollectionInfos(ctx, databases, tableNames, status, offset, limit)
+func (p *TextAuditTask) OpListByCollectionInfos(ctx *gin.Context, databases []string, tableNames []string, status int64, role *int64, offset, limit int) ([]*dbstruct.TextAuditTask, error) {
+	list, err := p.store.GetTextAuditTaskListByCollectionInfos(ctx, databases, tableNames, status, role, offset, limit)
 	if err != nil {
 		logger.Error("GetTextAuditTaskListByCollectionInfos fail, err: %v", err)
 		return make([]*dbstruct.TextAuditTask, 0), err