Merge branch 'dev'

徐近程
2 parents 5c4ef937 05d1a424
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 {
         if (CommonUtils.isNotEmpty(video_title)) {
             criteria.andLike("video_title", "%" + video_title + "%");
         }
-        if (CommonUtils.isNotNull(state) && state == 0) {
+        if (CommonUtils.isNotNull(state)) {
             criteria.andEqualTo("state", state);
-        } else if (CommonUtils.isNotNull(state) && state == 1) {
-            criteria.andEqualTo("state", state);
-            criteria2.andEqualTo("state", 2);
-            example.or(criteria2);
         }
         if (CommonUtils.isNotEmpty(video_priority)) {
             criteria.andEqualTo("video_priority", video_priority);