共创项目修改

@@ -52,6 +52,8 @@ type SearchCooperationProjectQuery struct {
 	UserId int64 `cname:"用户ID" json:"userId"`
 	UserId int64 `cname:"用户ID" json:"userId"`
 	// 用户基础数据id
 	// 用户基础数据id
 	UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`
 	UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`
+	// 额外的查询条件 0:不需要额外查询 1:额外查询
+	SearchCooperationProjectExtQueriesFlag int `cname:"额外的查询条件标识" json:"searchCooperationProjectExtQueriesFlag"`
 	// 额外的查询条件
 	// 额外的查询条件
 	SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
 	SearchCooperationProjectExtQueries []*SearchCooperationProjectExtQuery `cname:"额外的查询条件" json:"searchCooperationProjectExtQueries"`
 }
 }

@@ -276,6 +276,7 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
 			return q, nil
 			return q, nil
 		})
 		})
 	}
 	}
+	if searchCooperationProjectExtQueriesFlag, ok := queryOptions["searchCooperationProjectExtQueriesFlag"]; ok && searchCooperationProjectExtQueriesFlag.(int) != 0 {
 		if searchCooperationProjectExtQueries, ok := queryOptions["searchCooperationProjectExtQueries"]; ok && len(searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery)) > 0 {
 		if searchCooperationProjectExtQueries, ok := queryOptions["searchCooperationProjectExtQueries"]; ok && len(searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery)) > 0 {
 			query.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
 			query.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
 				for _, searchCooperationProjectExtQuery := range searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery) {
 				for _, searchCooperationProjectExtQuery := range searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery) {
@@ -301,8 +302,12 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
 						return q, nil
 						return q, nil
 					})
 					})
 				}
 				}
+				query.WhereOr(`cooperation_project.cooperation_project_undertaker_types @> '{?}'`, 3) //公开
 				return q, nil
 				return q, nil
 			})
 			})
+		} else {
+			query.Where(`cooperation_project.cooperation_project_undertaker_types @> '{?}'`, 3) //公开
+		}
 	}
 	}
 	if departmentName, ok := queryOptions["departmentName"]; ok && departmentName != "" {
 	if departmentName, ok := queryOptions["departmentName"]; ok && departmentName != "" {
 		query.Where("department->>'departmentName' like ? ", fmt.Sprintf("%%%s%%", departmentName))
 		query.Where("department->>'departmentName' like ? ", fmt.Sprintf("%%%s%%", departmentName))