合并分支 'dev' 到 'test'

refactor:优化共创项目详情查看速度



查看合并请求 !68

@@ -363,9 +363,12 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
 		// 判断项目关联的合约承接人类型
 		// 判断项目关联的合约承接人类型
 		undertakers := make([]*domain.Undertaker, 0)
 		undertakers := make([]*domain.Undertaker, 0)
 		if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
 		if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
+			"cooperationProjectNumber": cooperationProject.CooperationProjectNumber,
+			"companyId":                cooperationProject.Company.CompanyId,
+			"orgId":                    cooperationProject.Org.OrgId,
 			"offsetLimit": false,
 			"offsetLimit": false,
 		}); err != nil {
 		}); err != nil {
-
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		} else {
 		} else {
 			if countContracts > 0 {
 			if countContracts > 0 {
 				for _, cooperationContract := range cooperationContracts {
 				for _, cooperationContract := range cooperationContracts {

@@ -1143,6 +1143,9 @@ func (repository *CooperationContractRepository) Find(queryOptions map[string]in
 	if cooperationContractName, ok := queryOptions["cooperationContractName"]; ok && cooperationContractName != "" {
 	if cooperationContractName, ok := queryOptions["cooperationContractName"]; ok && cooperationContractName != "" {
 		query.Where("cooperation_contract_name like ?", fmt.Sprintf("%%%s%%", cooperationContractName))
 		query.Where("cooperation_contract_name like ?", fmt.Sprintf("%%%s%%", cooperationContractName))
 	}
 	}
+	if cooperationProjectNumber, ok := queryOptions["cooperationProjectNumber"]; ok && cooperationProjectNumber != "" {
+		query.Where("cooperation_project_number = ?", cooperationProjectNumber)
+	}
 	if departmentName, ok := queryOptions["departmentName"]; ok && departmentName != "" {
 	if departmentName, ok := queryOptions["departmentName"]; ok && departmentName != "" {
 		query.Where(`(cooperation_contract.department->>'departmentName')::text LIKE ?`, fmt.Sprintf("%%%s%%", departmentName))
 		query.Where(`(cooperation_contract.department->>'departmentName')::text LIKE ?`, fmt.Sprintf("%%%s%%", departmentName))
 	}
 	}