优化1

王言钊
1 parent 76d28cbd
Showing 2 changed files with 14 additions and 14 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/resources/templates/page/video.html
@@ -250,7 +250,8 @@ public class VideosController extends BaseController {
             yuming = ks_domain + "/";
         }
         detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags());
-
+        List<ShyActivity> activityList = shyActivityImpl.selectAll();
+        //model.addAttribute("activityList", activityList);
         ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid());
         if (CommonUtils.isNotNull(shySites)) {
             if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
@@ -259,13 +260,11 @@ public class VideosController extends BaseController {
  
                 //如果source1不等于null；直接查询
                 if (CommonUtils.isNotEmpty(source1)) {
-                    List<ShyActivity> activityList = shyActivityImpl.selectAll();
-                    model.addAttribute("activityList", activityList);
-                    //遍历集合拿到集合中的每一个对象
                     for (ShyActivity activity : activityList) {
-                        //从对象中获取属性值set给videos对象
-                        detailsContent.setSpid_desc(activity.getActivity());
-
+                        if (activity.getId().equals(Integer.valueOf(source1))) {
+                            detailsContent.setSpid_desc(activity.getActivity());
+                            break;
+                        }
                     }
                 }
  
@@ -135,21 +135,22 @@
                                             </div>
                                         </div>
  
-                                        <th:block th:text="${source}"></th:block>
+
                                         <div class="col-md-6" style="padding: 0;width: 25%;">
                                             <label for="state" class="control-label cb-toolbar">分类:</label>
                                             <div class="col-sm-10" style="padding: 0;">
                                                 <select class="form-control" id="source" name="source">
-                                                    <option value="" th:selected="selected">全部</option>
  
-                                                    <option th:selected="${activitys.id eq source}"
-                                                            th:each="activitys : ${activityList}"
-                                                            th:value="${activitys.id}">
-                                                        <th:block th:text="${activitys.activity}"></th:block>
+                                                    <option value="" >全部</option>
+                                                    <option th:each="activitys : ${activityList}"
+                                                            th:selected="${source}==${activitys.id}"
+                                                            th:value="${activitys.id}"
+                                                            th:text="${activitys.activity}">
                                                     </option>
  
                                                 </select>
-                                                <!--<input class="form-control" name="video_priority" type="text" id="video_priority">-->
+
+                                                <!--<     input class="form-control" name="video_priority" type="text" id="video_priority">-->
                                             </div>
                                         </div>
                                     </div>