@ -595,7 +595,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
fmt . Println ( "list request :==================== end ===================" )
fmt . Println ( "list request :==================== end ===================" )
//我未阅读的和我未操作的
//我未阅读的和我未操作的
queryApproval := & Approval { NowUserId : in . UserID }
queryApproval := & Approval { }
if in . SubmitterName != "" {
if in . SubmitterName != "" {
queryApproval . SubmitterName = in . SubmitterName
queryApproval . SubmitterName = in . SubmitterName
@ -610,11 +610,13 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
//}
//}
if in . ApprovalStatus <= StatusFail && in . ApprovalStatus > 0 { // 具体 的 审批状态
if in . ApprovalStatus <= StatusFail && in . ApprovalStatus > 0 { // 具体 的 审批状态
queryApproval . NowUserId = in . UserID
queryApproval . Status = int8 ( in . ApprovalStatus )
queryApproval . Status = int8 ( in . ApprovalStatus )
}
}
queryApprovalCopy := & ApprovalCopy { UserId : in . UserID }
queryApprovalCopy := & ApprovalCopy { UserId : in . UserID }
if in . ApprovalStatus > StatusFail { // 具体 的 阅读状态
if in . ApprovalStatus > StatusFail { // 具体 的 阅读状态
queryApprovalCopy . UserId = in . UserID
if in . ApprovalStatus == 4 {
if in . ApprovalStatus == 4 {
queryApprovalCopy . Status = 1
queryApprovalCopy . Status = 1
} else if in . ApprovalStatus == 5 {
} else if in . ApprovalStatus == 5 {
@ -638,8 +640,12 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
DB . Where ( & Approval { NowUserId : in . UserID , Status : StatusDoing } ) . // 我需要审批的
DB . Where ( & Approval { NowUserId : in . UserID , Status : StatusDoing } ) . // 我需要审批的
Or ( DB . Where ( "status = ?" , StatusOk ) . Where ( "id in (?)" , s1 ) ) ) // 已完成,抄送给我的
Or ( DB . Where ( "status = ?" , StatusOk ) . Where ( "id in (?)" , s1 ) ) ) // 已完成,抄送给我的
} else {
} else {
sonQuery := DB . Where ( queryApproval )
if in . ApprovalStatus > StatusFail {
sonQuery . Where ( DB . Where ( "id in (?)" , s1 ) )
}
modelObj = modelObj . Where ( & Approval { Type : in . Type } ) . Where (
modelObj = modelObj . Where ( & Approval { Type : in . Type } ) . Where (
DB . Where ( & Approval { SubmitterName : in . SubmitterName , Status : queryApproval . Status } ) . Or ( DB . Where ( "now_user_id = ?" , in . UserID ) ) . Or ( DB . Where ( "id in (?)" , s1 ) ) )
sonQuery )
}
}
modelObj . Count ( & count )
modelObj . Count ( & count )