1

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -26,7 +26,6 @@ import com.xxfc.platform.universal.feign.ThirdFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.bson.types.ObjectId;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -371,15 +370,18 @@ public class MsgBiz {
                 }
             }
             //下单时间
-            if (msgQueryDto.getStartTime() != null) {
-                DateTime dateTime = new DateTime();
-                dateTime.withMillis(msgQueryDto.getStartTime());
-                query.addCriteria(Criteria.where("time").gte(dateTime.getMillis()));
-            }
-            if(msgQueryDto.getEndTime() != null) {
-                DateTime dateTime = new DateTime();
-                dateTime.withMillis(msgQueryDto.getEndTime());
-                query.addCriteria((Criteria.where("time").lte(dateTime.getMillis())));
+            if (msgQueryDto.getStartTime() != null ) {
+                if (msgQueryDto.getEndTime() == null) {
+                    query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime()).lte(System.currentTimeMillis()));
+                } else {
+                    query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime()).lte(msgQueryDto.getEndTime()));
+                }
+            } else {
+                if (msgQueryDto.getEndTime() == null) {
+                    query.addCriteria(Criteria.where("body.time").gte(System.currentTimeMillis()).lte(System.currentTimeMillis()));
+                } else {
+                    query.addCriteria(Criteria.where("body.time").gte(System.currentTimeMillis()).lte(msgQueryDto.getEndTime()));
+                }
             }
             //用户名
             if (StringUtils.isNotBlank(msgQueryDto.getUsername())) {