Commit b0e0d390413a3e8678ef96a9bbf57760ced3a02b
Merge branch 'dev'
Showing
2 changed files
with
2 additions
and
1 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
| @@ -467,7 +467,7 @@ public class VideosServiceImpl { | @@ -467,7 +467,7 @@ public class VideosServiceImpl { | ||
| 467 | //审核类型，1:免审，2:机审，3:人工审 | 467 | //审核类型，1:免审，2:机审，3:人工审 |
| 468 | Integer shenheType = 3; | 468 | Integer shenheType = 3; |
| 469 | //如果当前sp是免审sp | 469 | //如果当前sp是免审sp |
| 470 | - 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())) { | 470 | + 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())) { |
| 471 | //免审 | 471 | //免审 |
| 472 | shenheType = 1; | 472 | shenheType = 1; |
| 473 | } else { | 473 | } else { |
src/main/resources/templates/page/video.html
| @@ -170,6 +170,7 @@ | @@ -170,6 +170,7 @@ | ||
| 170 | <option value="37">中国推介</option> | 170 | <option value="37">中国推介</option> |
| 171 | <option value="38">教学成果展</option> | 171 | <option value="38">教学成果展</option> |
| 172 | <option value="39">绽放夕阳</option> | 172 | <option value="39">绽放夕阳</option> |
| 173 | + <option value="40">家乡推介</option> | ||
| 173 | </select> | 174 | </select> |
| 174 | <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> | 175 | <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> |
| 175 | </div> | 176 | </div> |