Merge branch 'feature_sign_up' into test

# Conflicts:
#	pkg/application/mobile/cooperation/service/cooperation_projects.go
#	pkg/application/mobile/cooperation/service/statistics_person.go
#	pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_project.go

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

@@ -39,10 +39,11 @@ func (srv PersonStatisticsService) IndexStatistics(cmd *command.IndexStatisticsC
 	gatewayUser := allied_creation_user.NewHttplibAlliedCreationUser(
 		cmd.Operator)
 	users, err := gatewayUser.UserSearch(allied_creation_user.ReqUserSearch{
-		Limit:      1,
-		Offset:     0,
-		UserType:   domain.UserTypeCooperation | domain.UserTypeEmployee,
-		UserBaseId: cmd.Operator.UserBaseId,
+		Limit:        1,
+		Offset:       0,
+		UserType:     domain.UserTypeCooperation | domain.UserTypeEmployee,
+		UserBaseId:   cmd.Operator.UserBaseId,
+		EnableStatus: domain.UserStatusEnable,
 	})
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
@@ -103,9 +104,10 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer
 	gatewayUser := allied_creation_user.NewHttplibAlliedCreationUser(
 		cmd.Operator)
 	users, err := gatewayUser.UserSearch(allied_creation_user.ReqUserSearch{
-		Limit:      100,
-		Offset:     0,
-		UserBaseId: cmd.Operator.UserBaseId,
+		Limit:        100,
+		Offset:       0,
+		UserBaseId:   cmd.Operator.UserBaseId,
+		EnableStatus: domain.UserStatusEnable,
 		//UserType:   domain.UserTypeCooperation,
 	})
 	if err != nil {
@@ -181,6 +183,8 @@ func (srv PersonStatisticsService) CooperationProjectRecommend(projectQuery *com
 		PageNumber:                       projectQuery.PageNumber + 1,
 		PageSize:                         projectQuery.PageSize,
 		CooperationProjectUndertakerType: 3,
+		Status:                           1,
+		IsSkipFetchProjectModel:          true,
 		// Status:                           1,
 		SortByStatus: 1,
 	})

@@ -214,6 +214,8 @@ type (
 		SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
 		// 按共创项目状态排序
 		SortByStatus int32 `cname:"按共创项目状态排序" json:"sortByStatus,omitempty"`
+		// 是否跳过获取共创模式
+		IsSkipFetchProjectModel bool `cname:"是否跳过获取共创模式" json:"isSkipFetchProjectModel,omitempty"`
 	}
 	DataCooperationProjectSearchItem struct {
 		CooperationProjectID          string               `json:"cooperationProjectId"`