Commit 7195dda36e16b4ddcba1399a512ebb0b587ba2fc
1 parent
48c3e39b80
Exists in
master
and in
6 other branches
孕妇学校
Showing 1 changed file with 5 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java
View file @
7195dda
| ... | ... | @@ -118,6 +118,11 @@ |
| 118 | 118 | condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | + | |
| 122 | + if (null != courseEndTime) { | |
| 123 | + condition = condition.and("courseEndTime", courseEndTime, MongoOper.LTE); | |
| 124 | + } | |
| 125 | + | |
| 121 | 126 | if (null != keyword) { |
| 122 | 127 | MongoCondition con1 = MongoCondition.newInstance("courseSpeaker", keyword, MongoOper.LIKE); |
| 123 | 128 | MongoCondition con = MongoCondition.newInstance("courseName", keyword, MongoOper.LIKE); |
| ... | ... | @@ -142,11 +147,6 @@ |
| 142 | 147 | } |
| 143 | 148 | } |
| 144 | 149 | |
| 145 | - if (null != courseEndTime) { | |
| 146 | - if (null != c1) { | |
| 147 | - c1 = Criteria.where("courseEndTime").lte(courseEndTime); | |
| 148 | - } | |
| 149 | - } | |
| 150 | 150 | |
| 151 | 151 | |
| 152 | 152 | if (null != createdStart) { |