|
|
@@ -446,7 +446,7 @@ class PaperService extends BaseService
|
|
|
->where(['a.paper_id'=> $paperId,'a.status'=>1,'a.mark'=>1])
|
|
|
->where(function($query) use($isError,$userId){
|
|
|
if($isError==1){
|
|
|
- $query->where(['b.accurate'=>0,'b.user_id'=>$userId])->where('b.id','>', 0);
|
|
|
+ $query->where(['b.accurate'=>0,'b.user_id'=>$userId,'b.status'=>1,'b.mark'=>1]);
|
|
|
}
|
|
|
})
|
|
|
->where('a.sort','>', $sort)
|
|
|
@@ -462,7 +462,7 @@ class PaperService extends BaseService
|
|
|
->where(['a.paper_id'=> $paperId,'a.status'=>1,'a.mark'=>1])
|
|
|
->where(function($query) use($isError,$userId){
|
|
|
if($isError==1){
|
|
|
- $query->where(['b.accurate'=>0,'b.user_id'=>$userId])->where('b.id','>', 0);
|
|
|
+ $query->where(['b.accurate'=>0,'b.user_id'=>$userId,'b.status'=>1,'b.mark'=>1]);
|
|
|
}
|
|
|
})
|
|
|
->where('a.sort','<', $sort)
|