diff --git a/pkg/serializer/approval.go b/pkg/serializer/approval.go index 92c4d09..e6e6ea6 100644 --- a/pkg/serializer/approval.go +++ b/pkg/serializer/approval.go @@ -98,17 +98,11 @@ func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateReques } //BuildApprovals 处理单个detail返回 -func BuildApprovals(list []*model.Approval, userId uint64, status int) (details []*approval.CreateRequest) { +func BuildApprovals(list []*model.Approval, userId uint64) (details []*approval.CreateRequest) { for _, item := range list { temp := BuildApproval(item, userId) - if status == 6 { - if temp.AllStatus == 4 || temp.AllStatus == 5 { - details = append(details, temp) - } - } else { - details = append(details, temp) - } + details = append(details, temp) } return details diff --git a/pkg/service/approval.go b/pkg/service/approval.go index 1abcea4..28d1c10 100644 --- a/pkg/service/approval.go +++ b/pkg/service/approval.go @@ -251,7 +251,7 @@ func (a *ApprovalProvider) MySubmit(ctx context.Context, in *approval.ListReques list, count = model.MySubmitApprovals(in) response.Count = uint64(count) - response.Data = serializer.BuildApprovals(list, in.UserID, 0) + response.Data = serializer.BuildApprovals(list, in.UserID) return response, nil } @@ -263,14 +263,14 @@ func (a *ApprovalProvider) MyWork(ctx context.Context, in *approval.ListRequest) var list []*model.Approval var count int64 - if (in.Status == 0 || in.Status == 6) && in.ApprovedBossId == 0 { + if in.Status == 0 && in.ApprovedBossId == 0 { list, count = model.MyAllWorkApprovals(in) } else { list, count = model.MyWorkApprovals(in) } response.Count = uint64(count) - response.Data = serializer.BuildApprovals(list, in.UserID, int(in.Status)) + response.Data = serializer.BuildApprovals(list, in.UserID) return response, nil }