|
@@ -102,6 +102,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje |
|
@@ -102,6 +102,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje |
|
102
|
//项目名
|
102
|
//项目名
|
|
103
|
CooperationProjectName: listCooperationProjectQuery.CooperationProjectName,
|
103
|
CooperationProjectName: listCooperationProjectQuery.CooperationProjectName,
|
|
104
|
CompanyId: listCooperationProjectQuery.Operator.CompanyId,
|
104
|
CompanyId: listCooperationProjectQuery.Operator.CompanyId,
|
|
|
|
105
|
+ OrgIds: listCooperationProjectQuery.Operator.OrgIds,
|
|
105
|
})
|
106
|
})
|
|
106
|
if err != nil {
|
107
|
if err != nil {
|
|
107
|
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
108
|
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
|
@@ -146,16 +147,11 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro |
|
@@ -146,16 +147,11 @@ func (cooperationProjectService *CooperationProjectService) UpdateCooperationPro |
|
146
|
func (cooperationProjectService *CooperationProjectService) ListCooperationProjectSelector(listCooperationProjectQuery *query.CooperationProjectSelectorQuery) (int64, interface{}, error) {
|
147
|
func (cooperationProjectService *CooperationProjectService) ListCooperationProjectSelector(listCooperationProjectQuery *query.CooperationProjectSelectorQuery) (int64, interface{}, error) {
|
|
147
|
|
148
|
|
|
148
|
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator)
|
149
|
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationProjectQuery.Operator)
|
|
149
|
- orgIds := []string{}
|
|
|
|
150
|
- for _, v := range listCooperationProjectQuery.Operator.OrgIds {
|
|
|
|
151
|
- idStr := strconv.Itoa(int(v))
|
|
|
|
152
|
- orgIds = append(orgIds, idStr)
|
|
|
|
153
|
- }
|
|
|
|
154
|
result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
|
150
|
result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
|
|
155
|
PageSize: 999,
|
151
|
PageSize: 999,
|
|
156
|
CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber,
|
152
|
CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber,
|
|
157
|
CompanyId: listCooperationProjectQuery.Operator.CompanyId,
|
153
|
CompanyId: listCooperationProjectQuery.Operator.CompanyId,
|
|
158
|
- OrgIds: orgIds,
|
154
|
+ OrgIds: listCooperationProjectQuery.Operator.OrgIds,
|
|
159
|
})
|
155
|
})
|
|
160
|
if err != nil {
|
156
|
if err != nil {
|
|
161
|
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|
157
|
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
|