Authored by mlge

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{ @@ -497,6 +497,13 @@ public class GrassArticleServiceImpl implements IGrassArticleService{
497 GrassArticle grassArticle = new GrassArticle(); 497 GrassArticle grassArticle = new GrassArticle();
498 grassArticle.setId(articleId); 498 grassArticle.setId(articleId);
499 grassArticle.setAuthStatus(authStatus); 499 grassArticle.setAuthStatus(authStatus);
  500 + if(authStatus == 4){
  501 + //屏蔽的时候,清除推荐和置顶状态
  502 + grassArticle.setIsRecommend(0);
  503 + grassArticle.setIsTop(0);
  504 + grassArticle.setRecommendTime(0L);
  505 + grassArticle.setTopTime(0L);
  506 + }
500 grassArticle.setAuthorizeAccount(req.getAuthorizeAccount()); 507 grassArticle.setAuthorizeAccount(req.getAuthorizeAccount());
501 grassArticle.setAuthTime(System.currentTimeMillis()); 508 grassArticle.setAuthTime(System.currentTimeMillis());
502 grassArticleDao.updateByPrimaryKeySelective(grassArticle); 509 grassArticleDao.updateByPrimaryKeySelective(grassArticle);