Merge branch 'gray'

@@ -691,7 +691,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
             //推荐和置顶操作，清前台缓存
             //推荐和置顶操作，清前台缓存
             clearArticleListCache(req.getArticleId());
             clearArticleListCache(req.getArticleId());
             //后期新加的逻辑 发奖励-- 1）晒单的文章2）被推荐 3）没有发放过奖励
             //后期新加的逻辑 发奖励-- 1）晒单的文章2）被推荐 3）没有发放过奖励
-            if (isRecommend == 1 && articleInfo.getArticleType() == 4 && articleInfo.getRemRewardFlag() == 0) {
+            if (isRecommend != null && isRecommend == 1 && articleInfo.getArticleType() == 4 && articleInfo.getRemRewardFlag() == 0) {
                 sendRemReward(articleInfo);
                 sendRemReward(articleInfo);
             }
             }
         }
         }