@ -624,7 +624,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
}
DB . Model ( & Approval { } ) . Where ( & Approval { Type : in . Type } ) . Where ( queryApproval ) . Order ( "id " + in . OrderBy ) . Select ( "id" ) . Find ( & ids )
s1 := DB . Model ( & ApprovalCopy { } ) . Where ( queryApprovalCopy )
s1 := DB . Model ( & ApprovalCopy { } ) . Where ( queryApprovalCopy ) . Select ( "approval_id" )
if in . StartTime != "" && in . EndTime != "" {
modelObj = modelObj . Where ( " created_at between ? and ? " , in . StartTime , in . EndTime )
@ -636,14 +636,10 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
if in . SubmitterName == "" && in . ApprovalStatus == 0 {
modelObj = modelObj . Where ( & Approval { Type : in . Type } ) . Where (
DB . Where ( & Approval { NowUserId : in . UserID , Status : StatusDoing } ) . // 我需要审批的
Or ( DB . Where ( "status = ?" , StatusOk ) . Where ( "id in (?)" , s1 ) .Select ( "approval_id" ) )) // 已完成,抄送给我的
Or ( DB . Where ( "status = ?" , StatusOk ) . Where ( "id in (?)" , s1 ) )) // 已完成,抄送给我的
} else {
sonQuery := DB . Where ( queryApproval )
if in . ApprovalStatus > StatusFail {
sonQuery . Or ( DB . Where ( "id in (?)" , s1 . Where ( "approval_id in (?)" ) . Select ( "approval_id" ) ) )
}
modelObj = modelObj . Where ( & Approval { Type : in . Type } ) . Where (
sonQuery )
DB . Where ( & Approval { SubmitterName : in . SubmitterName , Status : queryApproval . Status } ) . Or ( DB . Where ( "now_user_id = ?" , in . UserID ) ) . Or ( DB . Where ( "id in (?)" , s1 ) ) )
}
modelObj . Count ( & count )