Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop

Gemfile

@@ -1,4 +1,5 @@
-source 'https://gems.ruby-china.com'
+#source 'https://gems.ruby-china.com'
+source 'https://mirrors.cloud.tencent.com/rubygems/'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gem 'rails', '~> 5.2.0'

app/queries/projects/list_query.rb

@@ -48,12 +48,12 @@ class Projects::ListQuery < ApplicationQuery
     @ids = Projects::ElasticsearchService.call(params[:search])
     items = items.where(platform: 'forge')
     if @ids.present?
-      items = items.where(id: @ids).by_name_or_identifier(params[:search])
+      # items = items.where(id: @ids).by_name_or_identifier(params[:search])
+      items = items.where(id: @ids)
     else
-      items = items.by_name_or_identifier(params[:search])
+      items = items.by_name_or_identifier(params[:search]).or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id)))
     end
-    items.or(main_collection.where(user_id: Owner.like(params[:search]).pluck(:id)))
-
+    items
   end
   
   def by_project_type(items)