合并分支 'dev' 到 'test'

fix:共创项目查询



查看合并请求 !71

@@ -277,29 +277,32 @@ func (repository *CooperationProjectRepository) Find(queryOptions map[string]int
 		})
 		})
 	}
 	}
 	if searchCooperationProjectExtQueries, ok := queryOptions["searchCooperationProjectExtQueries"]; ok && len(searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery)) > 0 {
 	if searchCooperationProjectExtQueries, ok := queryOptions["searchCooperationProjectExtQueries"]; ok && len(searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery)) > 0 {
-		for _, searchCooperationProjectExtQuery := range searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery) {
-			query.WhereOrGroup(func(q *orm.Query) (*orm.Query, error) {
-				if searchCooperationProjectExtQuery.ExtCompanyId != 0 {
-					q.Where("company->>'companyId' = '?'", searchCooperationProjectExtQuery.ExtCompanyId)
-				}
-				if searchCooperationProjectExtQuery.ExtOrgId != 0 {
-					q.Where("org->>'orgId' = '?'", searchCooperationProjectExtQuery.ExtOrgId)
-				}
-				if len(searchCooperationProjectExtQuery.ExtOrgIds) > 0 {
-					newOrgIds := utils.SliceItoa(searchCooperationProjectExtQuery.ExtOrgIds)
-					q.Where("org->>'orgId' in (?)", pg.In(newOrgIds))
-				}
-				if len(searchCooperationProjectExtQuery.ExtCooperationProjectUndertakerTypes) > 0 {
-					q.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
-						for _, cooperationProjectUndertakerType := range searchCooperationProjectExtQuery.ExtCooperationProjectUndertakerTypes {
-							q.WhereOr(`cooperation_project.cooperation_project_undertaker_types @> '{?}'`, cooperationProjectUndertakerType)
-						}
-						return q, nil
-					})
-				}
-				return q, nil
-			})
-		}
+		query.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
+			for _, searchCooperationProjectExtQuery := range searchCooperationProjectExtQueries.([]*query2.SearchCooperationProjectExtQuery) {
+				query.WhereOrGroup(func(q *orm.Query) (*orm.Query, error) {
+					if searchCooperationProjectExtQuery.ExtCompanyId != 0 {
+						q.Where("company->>'companyId' = '?'", searchCooperationProjectExtQuery.ExtCompanyId)
+					}
+					if searchCooperationProjectExtQuery.ExtOrgId != 0 {
+						q.Where("org->>'orgId' = '?'", searchCooperationProjectExtQuery.ExtOrgId)
+					}
+					if len(searchCooperationProjectExtQuery.ExtOrgIds) > 0 {
+						newOrgIds := utils.SliceItoa(searchCooperationProjectExtQuery.ExtOrgIds)
+						q.Where("org->>'orgId' in (?)", pg.In(newOrgIds))
+					}
+					if len(searchCooperationProjectExtQuery.ExtCooperationProjectUndertakerTypes) > 0 {
+						q.WhereGroup(func(q *orm.Query) (*orm.Query, error) {
+							for _, cooperationProjectUndertakerType := range searchCooperationProjectExtQuery.ExtCooperationProjectUndertakerTypes {
+								q.WhereOr(`cooperation_project.cooperation_project_undertaker_types @> '{?}'`, cooperationProjectUndertakerType)
+							}
+							return q, nil
+						})
+					}
+					return q, nil
+				})
+			}
+			return q, nil
+		})
 	}
 	}
 	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))