正在显示
3 个修改的文件
包含
9 行增加
和
9 行删除
@@ -66,8 +66,8 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo | @@ -66,8 +66,8 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo | ||
66 | OrganizationName: listCooperationModeQuery.OrganizationName, | 66 | OrganizationName: listCooperationModeQuery.OrganizationName, |
67 | CompanyId: listCooperationModeQuery.Operator.CompanyId, | 67 | CompanyId: listCooperationModeQuery.Operator.CompanyId, |
68 | UserId: 0, | 68 | UserId: 0, |
69 | - OrgIds: listCooperationModeQuery.Operator.OrgIds, | ||
70 | - OrgId: 0, | 69 | + OrgIds: nil, |
70 | + OrgId: listCooperationModeQuery.Operator.OrgId, | ||
71 | UserBaseId: 0, | 71 | UserBaseId: 0, |
72 | }) | 72 | }) |
73 | if err != nil { | 73 | if err != nil { |
@@ -151,7 +151,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje | @@ -151,7 +151,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje | ||
151 | PageSize: 999, | 151 | PageSize: 999, |
152 | CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber, | 152 | CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber, |
153 | CompanyId: listCooperationProjectQuery.Operator.CompanyId, | 153 | CompanyId: listCooperationProjectQuery.Operator.CompanyId, |
154 | - OrgIds: listCooperationProjectQuery.Operator.OrgIds, | 154 | + OrgId: listCooperationProjectQuery.Operator.OrgId, |
155 | }) | 155 | }) |
156 | if err != nil { | 156 | if err != nil { |
157 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 157 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
@@ -83,12 +83,12 @@ func (controller *CooperationModeController) SearchCooperationMode() { | @@ -83,12 +83,12 @@ func (controller *CooperationModeController) SearchCooperationMode() { | ||
83 | func (controller *CooperationModeController) ListCooperationMode() { | 83 | func (controller *CooperationModeController) ListCooperationMode() { |
84 | cooperationModeService := service.NewCooperationModeService(nil) | 84 | cooperationModeService := service.NewCooperationModeService(nil) |
85 | listCooperationModeQuery := &query.ListCooperationModeQuery{} | 85 | listCooperationModeQuery := &query.ListCooperationModeQuery{} |
86 | - err := controller.Unmarshal(listCooperationModeQuery) | ||
87 | - if err != nil { | ||
88 | - log.Logger.Debug("json err:" + err.Error()) | ||
89 | - controller.Response(nil, err) | ||
90 | - return | ||
91 | - } | 86 | + // err := controller.Unmarshal(listCooperationModeQuery) |
87 | + // if err != nil { | ||
88 | + // log.Logger.Debug("json err:" + err.Error()) | ||
89 | + // controller.Response(nil, err) | ||
90 | + // return | ||
91 | + // } | ||
92 | listCooperationModeQuery.Operator = controller.GetOperator() | 92 | listCooperationModeQuery.Operator = controller.GetOperator() |
93 | listCooperationModeQuery.PageNumber = 1 | 93 | listCooperationModeQuery.PageNumber = 1 |
94 | listCooperationModeQuery.PageSize = 999 | 94 | listCooperationModeQuery.PageSize = 999 |
-
请 注册 或 登录 后发表评论