Merge branch 'test6.9.1' of http://git.yoho.cn/platform/platform-cms into test6.9.1

@@ -497,6 +497,13 @@ public class GrassArticleServiceImpl implements IGrassArticleService{
             GrassArticle grassArticle = new GrassArticle();
             grassArticle.setId(articleId);
             grassArticle.setAuthStatus(authStatus);
+            if(authStatus == 4){
+                //屏蔽的时候，清除推荐和置顶状态
+                grassArticle.setIsRecommend(0);
+                grassArticle.setIsTop(0);
+                grassArticle.setRecommendTime(0L);
+                grassArticle.setTopTime(0L);
+            }
             grassArticle.setAuthorizeAccount(req.getAuthorizeAccount());
             grassArticle.setAuthTime(System.currentTimeMillis());
             grassArticleDao.updateByPrimaryKeySelective(grassArticle);