|
@@ -576,20 +576,14 @@ func (usersService *UsersService) GetInitPassword(operator domain.Operator) (str |
|
@@ -576,20 +576,14 @@ func (usersService *UsersService) GetInitPassword(operator domain.Operator) (str |
576
|
func (usersService *UsersService) SelectorCooperationProjectUsers(q *query.CooperationProjectUsersQuery) (interface{}, error) {
|
576
|
func (usersService *UsersService) SelectorCooperationProjectUsers(q *query.CooperationProjectUsersQuery) (interface{}, error) {
|
577
|
applications := make([]interface{}, 0)
|
577
|
applications := make([]interface{}, 0)
|
578
|
// 项目申请人
|
578
|
// 项目申请人
|
579
|
- if q.CooperationProjectId != 0 {
|
579
|
+ if len(q.CooperationProjectNumber) != 0 {
|
580
|
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(q.Operator)
|
580
|
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(q.Operator)
|
581
|
- resultProject, err := creationCooperationGateway.CooperationProjectGet(allied_creation_cooperation.ReqCooperationProjectGet{
|
|
|
582
|
- CooperationProjectId: q.CooperationProjectId,
|
|
|
583
|
- })
|
|
|
584
|
- if err != nil {
|
|
|
585
|
- return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
|
586
|
- }
|
|
|
587
|
resultApplication, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
|
581
|
resultApplication, err := creationCooperationGateway.CooperationApplicationsSearch(allied_creation_cooperation.ReqCooperationApplicationSearch{
|
588
|
- CooperationProjectNumber: resultProject.CooperationProject.CooperationProjectNumber,
|
582
|
+ CooperationProjectNumber: q.CooperationProjectNumber,
|
589
|
PageNumber: 0,
|
583
|
PageNumber: 0,
|
590
|
PageSize: 1000,
|
584
|
PageSize: 1000,
|
591
|
- CompanyId: resultProject.Company.CompanyId,
|
|
|
592
|
- OrgId: int64(resultProject.Org.OrgId),
|
585
|
+ CompanyId: int(q.Operator.CompanyId),
|
|
|
586
|
+ OrgId: int64(q.Operator.OrgId),
|
593
|
CooperationApplicationStatus: 2, //审核通过的
|
587
|
CooperationApplicationStatus: 2, //审核通过的
|
594
|
})
|
588
|
})
|
595
|
if err != nil {
|
589
|
if err != nil {
|