Commit e8ee1bfe265cbfd179b4a6394d222655bf8ec160
Merge branch 'dev'
Showing
1 changed file
with
1 additions
and
5 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
| @@ -307,12 +307,8 @@ public class VideosServiceImpl { | @@ -307,12 +307,8 @@ public class VideosServiceImpl { | ||
| 307 | if (CommonUtils.isNotEmpty(video_title)) { | 307 | if (CommonUtils.isNotEmpty(video_title)) { |
| 308 | criteria.andLike("video_title", "%" + video_title + "%"); | 308 | criteria.andLike("video_title", "%" + video_title + "%"); |
| 309 | } | 309 | } |
| 310 | - if (CommonUtils.isNotNull(state) && state == 0) { | 310 | + if (CommonUtils.isNotNull(state)) { |
| 311 | criteria.andEqualTo("state", state); | 311 | criteria.andEqualTo("state", state); |
| 312 | - } else if (CommonUtils.isNotNull(state) && state == 1) { | ||
| 313 | - criteria.andEqualTo("state", state); | ||
| 314 | - criteria2.andEqualTo("state", 2); | ||
| 315 | - example.or(criteria2); | ||
| 316 | } | 312 | } |
| 317 | if (CommonUtils.isNotEmpty(video_priority)) { | 313 | if (CommonUtils.isNotEmpty(video_priority)) { |
| 318 | criteria.andEqualTo("video_priority", video_priority); | 314 | criteria.andEqualTo("video_priority", video_priority); |