merge feature_sign_up

@@ -12,6 +12,6 @@ require (
 	github.com/google/uuid v1.1.1
 	github.com/linmadan/egglib-go v0.0.0-20210827085852-177fa745932d
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/text v0.3.6
 	github.com/tal-tech/go-queue v1.0.5
+	golang.org/x/text v0.3.6
 )

@@ -3,13 +3,11 @@ package service
 import (
 	"fmt"
 	"github.com/linmadan/egglib-go/core/application"
-	"github.com/linmadan/egglib-go/core/application"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/application/common/query"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_basic"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/version_server"
-	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/allied_creation_user"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/infrastructure/service_gateway/version_server"
 )
 
 const IOSPage = "http://fir.fjmaimaimai.com/pdvn"

@@ -137,7 +137,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery
 		PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
 		PageSize:   projectQuery.PageSize,
 		OrgId:      projectQuery.OrgId,
-		Status:                                 1, //搜索状态为“招标中”项目
+		//Status:                                 1, //搜索状态为“招标中”项目
 		Keyword:                                projectQuery.Keyword,
 		SearchCooperationProjectExtQueriesFlag: 1,
 		SearchCooperationProjectExtQueries:     extQueries,
@@ -243,10 +243,11 @@ func (srv CooperationProjectService) PersonSearchCooperationProjectStarred(proje
 	result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
 		PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
 		PageSize:   projectQuery.PageSize,
-		Status:                  1, //搜索状态为“招标中”项目
+		//Status:                  1, //搜索状态为“招标中”项目
 		Keyword:                 projectQuery.Keyword,
 		OrgIds:                  userInfo.FavoriteOrg(),
 		IsSkipFetchProjectModel: true,
+		SortByStatus:            1,
 	})
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())