Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -1,5 +1,6 @@
 package com.caimei.www.controller.unlimited;
 
+import com.alibaba.fastjson.JSON;
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.link.CmBrandLandingVO;
@@ -82,7 +83,6 @@ public class ArticleController extends BaseController {
         return ARTICLE_LIST_PATH;
     }
 
-
     /**
      * 文章列表【旧label】
      */

src/main/java/com/caimei/www/mapper/ArticleDao.java

@@ -61,7 +61,7 @@ public interface ArticleDao {
      * @param
      * @return
      */
-    List<Article> getArticleRelatedId(String relatedId);
+    List<Article> getArticleRelatedId(String authorId);
     /**
      * 获取美业资料
      *

src/main/java/com/caimei/www/service/page/impl/ArticleServiceImpl.java

@@ -109,8 +109,8 @@ public class ArticleServiceImpl implements ArticleService {
      *
      */
     @Override
-    public List<Article> getArticleRelatedId(String relatedId){
-        List<Article> infoRelated = articleDao.getArticleRelatedId(relatedId);
+    public List<Article> getArticleRelatedId(String authorId){
+        List<Article> infoRelated = articleDao.getArticleRelatedId(authorId);
         infoRelated.forEach(item -> {
             item.setImage(ImageUtil.getImageURL("", item.getImage(), 0, domain));
         });

src/main/resources/mapper/ArticleMapper.xml

@@ -86,7 +86,7 @@
 		where cr.type=1
 		and a.enabledStatus = 1
 		and a.auditStatus = 2
-		and a.relatedId = #{relatedId}
+		and cr.authorId = #{authorId}
 		and NOW() >= a.pubdate
 		order by cr.sort asc, a.pubdate desc
 	</select>