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

@@ -11,7 +11,7 @@ type CooperationProjectUsersQuery struct {
 	//操作人
 	//操作人
 	Operator domain.Operator `json:"-"`
 	Operator domain.Operator `json:"-"`
 	// 共创项目ID - 获取项目申请人列表
 	// 共创项目ID - 获取项目申请人列表
-	CooperationProjectId int `json:"cooperationProjectId,string"`
+	CooperationProjectNumber string `json:"cooperationProjectNumber"`
 }
 }
 
 
 func (departmentsUsersQuery *CooperationProjectUsersQuery) Valid(validation *validation.Validation) {
 func (departmentsUsersQuery *CooperationProjectUsersQuery) Valid(validation *validation.Validation) {

@@ -576,20 +576,14 @@ func (usersService *UsersService) GetInitPassword(operator domain.Operator) (str
 func (usersService *UsersService) SelectorCooperationProjectUsers(q *query.CooperationProjectUsersQuery) (interface{}, error) {
 func (usersService *UsersService) SelectorCooperationProjectUsers(q *query.CooperationProjectUsersQuery) (interface{}, error) {
 	applications := make([]interface{}, 0)
 	applications := make([]interface{}, 0)
 	// 项目申请人
 	// 项目申请人
-	if q.CooperationProjectId != 0 {
+	if len(q.CooperationProjectNumber) != 0 {
 		creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(q.Operator)
 		creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(q.Operator)
-		resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{
-			CooperationProjectId: q.CooperationProjectId,
-		})
-		if err != nil {
-			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-		}
 		resultApplication, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
 		resultApplication, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
-			CooperationProjectNumber:     resultProject.CooperationProject.CooperationProjectNumber,
+			CooperationProjectNumber:     q.CooperationProjectNumber,
 			PageNumber:                   0,
 			PageNumber:                   0,
 			PageSize:                     1000,
 			PageSize:                     1000,
-			CompanyId:                    resultProject.Company.CompanyId,
-			OrgId:                        int64(resultProject.Org.OrgId),
+			CompanyId:                    int(q.Operator.CompanyId),
+			OrgId:                        int64(q.Operator.OrgId),
 			CooperationApplicationStatus: 2, //审核通过的
 			CooperationApplicationStatus: 2, //审核通过的
 		})
 		})
 		if err != nil {
 		if err != nil {