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

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

@@ -123,7 +123,8 @@ public class ArticleServiceImpl implements ArticleServiceI {
         oneById.setCurVerifyUserId(null);
         oneById.setStatus(2);
         dao.updateOne(oneById);
-        TArticleColumn tac = dao.getOneAC(t.getId(), columnId);
+//        TArticleColumn tac = dao.getOneAC(t.getId(), columnId);
+        TArticleColumn tac = dao.getOneAC(t.getId(), null);
         tac.setIsTop(t.getIsNew());
         tac.setIsTuijian(t.getIsTop());
         tac.setIsBig(t.getIsBig());

wxdks/src/main/resources/com/c3/wxdks/mapper/ArticleMapper.xml

@@ -355,7 +355,16 @@
 	</delete>
 
     <select id="getOneAC" resultType="com.c3.wxdks.entity.TArticleColumn">
-		select * from t_article_column where articleId= #{articleId} and columnId= #{columnId} limit 1
+		select
+		    *
+		from
+		     t_article_column
+		where
+		    articleId= #{articleId}
+		    <if test="columnId != null and columnId != ''">
+                and columnId= #{columnId}
+            </if>
+        limit 1
 	</select>
 
     <insert id="saveArticleVerify" parameterType="com.c3.wxdks.entity.TAcrticleVerify" useGeneratedKeys="true">

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

@@ -148,14 +148,14 @@ function renderHtml(data, pre, parentSelector) {
                 '<img title="' + obj.title + '" src="' + (obj.titlepic == null || obj.titlepic.length < 1 ? '../img/testImg.png' : obj.titlepic) + '">' +
                 '</div>';*/
 
-            swiperHtml += '<div data-id="' + obj.id + '" class="swiper-slide"><img title="' + obj.title + '" src="' + (obj.titlepic == null ? '../img/testImg.png' : obj.titlepic) + '"></div>';
+            swiperHtml += '<div data-id="' + obj.id + '" class="swiper-slide"><img title="' + obj.title + '" src="' + (obj.titlepic == null || obj.titlepic == '' ? '../img/testImg.png' : obj.titlepic) + '"></div>';
             swiperContent[i] = { cont1: obj.title, cont2: obj.summary || '暂无摘要' }
 
         } else if (curr == 1 && i < 8) {
             rightHtml += '<li data-id="' + obj.id + '">' +
                 '<h3 class="bt" title="' + obj.title + '">' + obj.title + '</h3>' +
                 '<div class="swiContent">' +
-                '<img src="' + (obj.titlepic == null ? '../img/testImg.png' : obj.titlepic) + '" alt="新闻图片">' +
+                '<img src="' + (obj.titlepic == null || obj.titlepic == '' ? '../img/testImg.png' : obj.titlepic) + '" alt="新闻图片">' +
                 '<span>' + obj.summary + '</span>' +
                 '</div>' +
                 '</li>'