From 26b93e84d4153039ef3600355308d2a743dc3be7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 23 十二月 2024 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java
index 7d19c2c..a1a9b36 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java
@@ -52,7 +52,6 @@
if(Objects.isNull(ywDeviceRecord)
|| Objects.isNull(ywDeviceRecord.getDeviceId())
|| Objects.isNull(ywDeviceRecord.getStatus())
- || StringUtils.isBlank(ywDeviceRecord.getContent())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -180,6 +179,7 @@
.ge(Objects.nonNull(model.getStartDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getStartDate()))
.le(Objects.nonNull(model.getEndDate()),YwDeviceRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getEndDate()))
.eq(YwDeviceRecord::getIsdeleted,Constants.ZERO)
+ .orderByDesc(YwDeviceRecord::getCreateDate)
);
return PageData.from(iPage);
}
--
Gitblit v1.9.3