TRX 1 anno fa
parent
commit
2623eb9cb0

+ 2 - 2
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/OperationMessageResultDaoImpl.java

@@ -32,6 +32,7 @@ import java.util.regex.Pattern;
 public class OperationMessageResultDaoImpl extends BaseImpl implements OperationMessageResultDaoExtend {
 
     private static final Logger log = LoggerFactory.getLogger(OperationMessageResultDaoImpl.class);
+
     @Autowired
     private MongoTemplate mongoTemplate;
 
@@ -40,7 +41,7 @@ public class OperationMessageResultDaoImpl extends BaseImpl implements Operation
 
     @Override
     public Page<OperationMessageResult> page(Pageable pageable, OperationMessageResultSearch param) {
-        Criteria criteria = new Criteria();
+        Criteria criteria = buildCriteriaAboutTime(param);
 
         if (StringUtils.isNotEmpty(param.getDeviceId())) {
             criteria.and("deviceId").is(param.getDeviceId());
@@ -86,7 +87,6 @@ public class OperationMessageResultDaoImpl extends BaseImpl implements Operation
         if (!CollectionUtils.isEmpty(criterias)) {
             criteria.andOperator(criterias.toArray(new Criteria[]{}));
         }
-        criteria.and("isDelete").is(Boolean.FALSE);
 
         Sort sort = buildSort(param);
         Query query = Query.query(criteria);