|
@@ -99,7 +99,7 @@ public class MarkTaskAssembler {
|
|
|
|
|
|
markTaskDTO.setIsRejectedByLeader(paper.isRejectedByLeader() == null ? false : paper.isRejectedByLeader());
|
|
|
//打回总次数
|
|
|
- int rejectedCount = markLogRepo.countByWorkIdAndPaperIdAndOperType(paper.getWorkId(), paper.getId(), MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getId());
|
|
|
+ int rejectedCount = markLogRepo.countByWorkIdAndPaperIdAndOperType(paper.getWorkId(), paper.getId(), Objects.nonNull(paper.isRejectedByLeader()) && paper.isRejectedByLeader() ? MarkLogOperType.CALLBACK_LEVEl.getId() : MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getId());
|
|
|
markTaskDTO.setRejectedCount(rejectedCount);
|
|
|
}
|
|
|
return markTaskDTO;
|