luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

改回 1.0

Browse Source
This commit is contained in:
jhc 2023-04-13 19:06:06 +08:00
parent 8230c35dea
commit a6eb68c2ad
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/serializer/approval.go
View File

@ -98,17 +98,11 @@ func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateReques
} }
//BuildApprovals 处理单个detail返回 //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 { for _, item := range list {
temp := BuildApproval(item, userId) temp := BuildApproval(item, userId)
if status == 6 { details = append(details, temp)
if temp.AllStatus == 4 || temp.AllStatus == 5 {
details = append(details, temp)
}
} else {
details = append(details, temp)
}
} }
return details return details

6
pkg/service/approval.go
View File

@ -251,7 +251,7 @@ func (a *ApprovalProvider) MySubmit(ctx context.Context, in *approval.ListReques
list, count = model.MySubmitApprovals(in) list, count = model.MySubmitApprovals(in)
response.Count = uint64(count) response.Count = uint64(count)
response.Data = serializer.BuildApprovals(list, in.UserID, 0) response.Data = serializer.BuildApprovals(list, in.UserID)
return response, nil return response, nil
} }
@ -263,14 +263,14 @@ func (a *ApprovalProvider) MyWork(ctx context.Context, in *approval.ListRequest)
var list []*model.Approval var list []*model.Approval
var count int64 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) list, count = model.MyAllWorkApprovals(in)
} else { } else {
list, count = model.MyWorkApprovals(in) list, count = model.MyWorkApprovals(in)
} }
response.Count = uint64(count) response.Count = uint64(count)
response.Data = serializer.BuildApprovals(list, in.UserID, int(in.Status)) response.Data = serializer.BuildApprovals(list, in.UserID)
return response, nil return response, nil
} }