正在显示
3 个修改的文件
包含
3 行增加
和
0 行删除
| @@ -161,6 +161,7 @@ func (srv CooperationApplicationsService) PersonSearchCooperationApplications(ap | @@ -161,6 +161,7 @@ func (srv CooperationApplicationsService) PersonSearchCooperationApplications(ap | ||
| 161 | CompanyId: int(applicationQuery.Operator.CompanyId), | 161 | CompanyId: int(applicationQuery.Operator.CompanyId), |
| 162 | CooperationApplicationStatus: applicationQuery.Status, | 162 | CooperationApplicationStatus: applicationQuery.Status, |
| 163 | UserBaseId: applicationQuery.Operator.UserBaseId, | 163 | UserBaseId: applicationQuery.Operator.UserBaseId, |
| 164 | + IsCanceled: 2, | ||
| 164 | }) | 165 | }) |
| 165 | if err != nil { | 166 | if err != nil { |
| 166 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 167 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) |
| @@ -70,6 +70,7 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat | @@ -70,6 +70,7 @@ func (cooperationApplicationService *CooperationApplicationService) ListCooperat | ||
| 70 | PageNumber: listCooperationApplicationQuery.PageNumber, | 70 | PageNumber: listCooperationApplicationQuery.PageNumber, |
| 71 | PageSize: listCooperationApplicationQuery.PageSize, | 71 | PageSize: listCooperationApplicationQuery.PageSize, |
| 72 | CompanyId: int(listCooperationApplicationQuery.Operator.CompanyId), | 72 | CompanyId: int(listCooperationApplicationQuery.Operator.CompanyId), |
| 73 | + IsCanceled: 3, | ||
| 73 | }) | 74 | }) |
| 74 | if err != nil { | 75 | if err != nil { |
| 75 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 76 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
| @@ -171,6 +171,7 @@ type ( | @@ -171,6 +171,7 @@ type ( | ||
| 171 | OrgId int64 `json:"orgId"` // 组织机构ID | 171 | OrgId int64 `json:"orgId"` // 组织机构ID |
| 172 | UserId int64 `json:"userId"` | 172 | UserId int64 `json:"userId"` |
| 173 | UserBaseId int64 `json:"userBaseId"` | 173 | UserBaseId int64 `json:"userBaseId"` |
| 174 | + IsCanceled int `json:"isCanceled"` //1正常,2取消,3所有 | ||
| 174 | } | 175 | } |
| 175 | 176 | ||
| 176 | DataCooperationApplicationSearch struct { | 177 | DataCooperationApplicationSearch struct { |
-
请 注册 或 登录 后发表评论