models/resource_queue.go

@@ -502,6 +502,15 @@ func GetExclusiveQueueIds(opts FindSpecsOptions) []*ResourceExclusivePool {
 	return queues
 }
 
+func GetAllExclusiveQueueIds() []*ResourceExclusivePool {
+	pools, err := FindExclusivePools()
+	if err != nil {
+		log.Error("GetSpecialQueueIds FindSpecialQueueConfig err.%v", err)
+		return nil
+	}
+	return pools
+}
+
 func IsUserInExclusivePool(userId int64) bool {
 	userOrgs, err := GetOrgsByUserID(userId, true)
 	if err != nil {

models/resource_specification.go

@@ -455,7 +455,7 @@ func HandleSpecialQueues(specs []*Specification, userId int64, opts FindSpecsOpt
 	if isUserInSpecialPool {
 		specs = handleExclusiveUserSpecs(specs, userId, opts)
 	} else {
-		specs = handleNormalUserSpecs(specs, opts)
+		specs = handleNormalUserSpecs(specs)
 	}
 	return specs
 }
@@ -479,8 +479,8 @@ func handleExclusiveUserSpecs(specs []*Specification, userId int64, opts FindSpe
 	return specs
 }
 
-func handleNormalUserSpecs(specs []*Specification, opts FindSpecsOptions) []*Specification {
-	queues := GetExclusiveQueueIds(opts)
+func handleNormalUserSpecs(specs []*Specification) []*Specification {
+	queues := GetAllExclusiveQueueIds()
 	queueIds := make([]int64, 0)
 	for _, queue := range queues {
 		queueIds = append(queueIds, queue.QueueId)