Merge branch 'dev'

徐近程
2 parents 5b0d3113 393684cd
Showing 2 changed files with 2 additions and 1 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/page/video.html
@@ -467,7 +467,7 @@ public class VideosServiceImpl {
         //审核类型，1:免审，2:机审，3:人工审
         Integer shenheType = 3;
         //如果当前sp是免审sp
-        if (sites.contains(shyVideo.getSpid()) || "1".equals(shyVideo.getSource()) || "9".equals(shyVideo.getSource()) || "8".equals(shyVideo.getSource()) || "29".equals(shyVideo.getSource()) || "36".equals(shyVideo.getSource()) || "38".equals(shyVideo.getSource()) || "39".equals(shyVideo.getSource())) {
+        if (sites.contains(shyVideo.getSpid()) || "1".equals(shyVideo.getSource()) || "9".equals(shyVideo.getSource()) || "8".equals(shyVideo.getSource()) || "29".equals(shyVideo.getSource()) || "36".equals(shyVideo.getSource()) || "38".equals(shyVideo.getSource()) || "39".equals(shyVideo.getSource())|| "40".equals(shyVideo.getSource())) {
             //免审
             shenheType = 1;
         } else {
@@ -170,6 +170,7 @@
                                                     <option value="37">中国推介</option>
                                                     <option value="38">教学成果展</option>
                                                     <option value="39">绽放夕阳</option>
+                                                    <option value="40">家乡推介</option>
                                                 </select>
                                                 <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
                                             </div>