Merge branch 'master' of http://116.63.33.55/git/zlhbw

wxdks/src/main/java/com/c3/wxdks/service/impl/ArticleServiceImpl.java

@@ -132,6 +132,7 @@ public class ArticleServiceImpl implements ArticleServiceI {
         tac.setColor(t.getColor());
         tac.setFbtcolor(t.getFbtcolor());
         tac.setJtcolor(t.getJtcolor());
+        tac.setColumnId(columnId);
         dao.updateArticleColumn(tac);
         return "1";
     }

wxdks/src/main/resources/static/zlhbw/jgjj/jgjj.js

@@ -44,7 +44,8 @@ $(".crumbs").on("click", ".crumb", function() {
  */
 function initPageClick() {
     $('.list').on('click', 'li', function(ele) {
-        initPageContent($(this).attr('data-id'));
+        sessionStorage.setItem('jgjj-id', $(this).attr('data-id'));
+        initPageContent();
     })
 }
 
@@ -125,7 +126,7 @@ function initPageContent(id) {
                     $('.text_title').empty().append(data.title);
                     $('.content_t').empty().append(data.content);
                 }
-                sessionStorage.removeItem('jgjj-id');
+                // sessionStorage.removeItem('jgjj-id');
             }
         })
     }