Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -73,6 +73,7 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat
 		CooperationProjectName:       listCooperationApplicationQuery.ProjectName,
 		CooperationProjectName:       listCooperationApplicationQuery.ProjectName,
 		PageNumber:                   listCooperationApplicationQuery.PageNumber,
 		PageNumber:                   listCooperationApplicationQuery.PageNumber,
 		PageSize:                     listCooperationApplicationQuery.PageSize,
 		PageSize:                     listCooperationApplicationQuery.PageSize,
+		CompanyId:                    int(listCooperationApplicationQuery.Operator.CompanyId),
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -83,6 +83,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
 		CooperationProjectNumber: resultProject.CooperationProject.CooperationProjectNumber,
 		CooperationProjectNumber: resultProject.CooperationProject.CooperationProjectNumber,
 		PageNumber:               0,
 		PageNumber:               0,
 		PageSize:                 0,
 		PageSize:                 0,
+		CompanyId:                resultProject.Company.CompanyId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -163,6 +163,9 @@ type (
 		PageNumber                   int    `json:"pageNumber"`
 		PageNumber                   int    `json:"pageNumber"`
 		PageSize                     int    `json:"pageSize"`
 		PageSize                     int    `json:"pageSize"`
 		CompanyId                    int    `json:"companyId"`
 		CompanyId                    int    `json:"companyId"`
+		OrgId                        int64  `json:"orgId"` // 组织机构ID
+		UserId                       int64  `json:"userId"`
+		UserBaseId                   int64  `json:"userBaseId"`
 	}
 	}
 
 
 	DataCooperationApplicationSearch struct {
 	DataCooperationApplicationSearch struct {