Skip to content

C
cloud-platform
Commit 7650c2d7 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge branch 'master-bacground-im' into dev

parents 4e2a84a5 f734cbd1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
View file @ 7650c2d7
...@@ -365,13 +365,11 @@ public class MsgBiz { ...@@ -365,13 +365,11 @@ public class MsgBiz {
if (msgQueryDto.getSource() != null) { if (msgQueryDto.getSource() != null) {
if (msgQueryDto.getSource() == 1) { if (msgQueryDto.getSource() == 1) {
query.addCriteria(Criteria.where("source").is(msgQueryDto.getSource())); query.addCriteria(Criteria.where("source").is(msgQueryDto.getSource()));
} else {
query.addCriteria(Criteria.where("source").is(msgQueryDto.getSource()).orOperator(Criteria.where("source").is(null)));
} }
} }
//下单时间 //下单时间
if (msgQueryDto.getStartTime() != null) { if (msgQueryDto.getStartTime() != null) {
query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime()).orOperator(Criteria.where("body.time").lte(msgQueryDto.getEndTime()))); query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime())).addCriteria((Criteria.where("body.time").lte(msgQueryDto.getEndTime())));
} }
//用户名 //用户名
if (StringUtils.isNotBlank(msgQueryDto.getUsername())) { if (StringUtils.isNotBlank(msgQueryDto.getUsername())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment