Merge pull request '修改查询语句' (#7069) from zouap_dev into model-refactor

Reviewed-on: #7069

models/ai_model_manage.go

@@ -891,20 +891,21 @@ func QueryModelForSearch(opts *AiModelQueryOptions) ([]*AiModelManage, int64, er
 	}
 
 	query = query.And(
-		builder.Eq{"owner_id": opts.UserID},
 		builder.Or(
-			builder.In("id", builder.Select("`subject_access`.subject_id::text").
-				From("subject_access").
-				Where(builder.Eq{"`subject_access`.user_id": opts.UserID}.
-					And(builder.Eq{"`subject_access`.subject_type": AimodelSubject}).
-					And(builder.In("`subject_access`.mode", int(AccessModeRead), int(AccessModeWrite), int(AccessModeAdmin))))),
-			builder.In("id", builder.Select("`team_subject`.subject_id::text").
-				From("team_subject").
-				Where(builder.Eq{"`team_user`.uid ": opts.UserID}.
-					And(builder.Neq{"`team`.aimodel_authorize": int(AccessModeOwner)})).
-				Join("INNER", "team_user", "`team_user`.team_id = `team_subject`.team_id").
-				Join("INNER", "team", "`team`.id = `team_subject`.team_id")),
-		),
+			builder.Eq{"owner_id": opts.UserID},
+			builder.Or(
+				builder.In("id", builder.Select("`subject_access`.subject_id::text").
+					From("subject_access").
+					Where(builder.Eq{"`subject_access`.user_id": opts.UserID}.
+						And(builder.Eq{"`subject_access`.subject_type": AimodelSubject}).
+						And(builder.In("`subject_access`.mode", int(AccessModeRead), int(AccessModeWrite), int(AccessModeAdmin))))),
+				builder.In("id", builder.Select("`team_subject`.subject_id::text").
+					From("team_subject").
+					Where(builder.Eq{"`team_user`.uid ": opts.UserID}.
+						And(builder.Neq{"`team`.aimodel_authorize": int(AccessModeOwner)})).
+					Join("INNER", "team_user", "`team_user`.team_id = `team_subject`.team_id").
+					Join("INNER", "team", "`team`.id = `team_subject`.team_id")),
+			)),
 	)
 	query = query.And(builder.Eq{"is_private": true})
 

models/search_record.go

@@ -64,20 +64,21 @@ func setDataSetQueryCondition(Keyword string, userId int64) builder.Cond {
 		query = query.And(builder.Or(builder.Like{"lower_alias", "%" + strings.ToLower(Keyword) + "%"}, builder.Like{"lower_name", "%" + strings.ToLower(Keyword) + "%"}))
 	}
 	query = query.And(
-		builder.Eq{"owner_id": userId},
 		builder.Or(
-			builder.In("id", builder.Select("`subject_access`.subject_id").
-				From("subject_access").
-				Where(builder.Eq{"`subject_access`.user_id": userId}.
-					And(builder.Eq{"`subject_access`.subject_type": DatasetSubject}).
-					And(builder.In("`subject_access`.mode", int(AccessModeRead), int(AccessModeWrite), int(AccessModeAdmin))))),
-			builder.In("id", builder.Select("`team_subject`.subject_id").
-				From("team_subject").
-				Where(builder.Eq{"`team_user`.uid ": userId}.
-					And(builder.Neq{"`team`.dataset_authorize": int(AccessModeOwner)})).
-				Join("INNER", "team_user", "`team_user`.team_id = `team_subject`.team_id").
-				Join("INNER", "team", "`team`.id = `team_subject`.team_id")),
-		),
+			builder.Eq{"owner_id": userId},
+			builder.Or(
+				builder.In("id", builder.Select("`subject_access`.subject_id").
+					From("subject_access").
+					Where(builder.Eq{"`subject_access`.user_id": userId}.
+						And(builder.Eq{"`subject_access`.subject_type": DatasetSubject}).
+						And(builder.In("`subject_access`.mode", int(AccessModeRead), int(AccessModeWrite), int(AccessModeAdmin))))),
+				builder.In("id", builder.Select("`team_subject`.subject_id").
+					From("team_subject").
+					Where(builder.Eq{"`team_user`.uid ": userId}.
+						And(builder.Neq{"`team`.dataset_authorize": int(AccessModeOwner)})).
+					Join("INNER", "team_user", "`team_user`.team_id = `team_subject`.team_id").
+					Join("INNER", "team", "`team`.id = `team_subject`.team_id")),
+			)),
 	)
 	query = query.And(
 		builder.Eq{"is_private": true},