diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java index 1c52ef80..e59840ab 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java @@ -335,7 +335,8 @@ public class QmsPqcTaskRecordControllerService { .isNotNull(QmsPqcTaskRecord::getRelatedTaskId) .orderByDesc(QmsPqcTaskRecord::getCreateTime); } else if (Objects.equals(request.getType(), 0)) { - queryWrapper.eq(QmsPqcTaskRecord::getStatus, (short) 1) + queryWrapper.in(QmsPqcTaskRecord::getStatus, (short) 1, (short) 2) + .orderByAsc(QmsPqcTaskRecord::getStatus) .orderByDesc(QmsPqcTaskRecord::getCreateTime); } else { VUtil.trueThrowBusinessError(true).throwMessage("查询类型不正确");