Merge branch 'test6.9.10' into test6.9.10

@@ -871,6 +871,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
                 List<Integer> limitSendUids = uidList.stream().filter(uid -> !specAtUids.contains(uid)).collect(Collectors.toList());
                 List<Integer> needSendList = new ArrayList<>();
                 if(CollectionUtils.isNotEmpty(limitSendUids)){
+                    uidList.removeAll(limitSendUids);
                     //@用户次数限制
                     int atThreshold = configReader.getInt("platform.grass.atUser.threshold", 0);
 
@@ -908,8 +909,9 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
                         redis.longExpire(atInboxIntelTimesCacheKey, 24, TimeUnit.HOURS);
                         logger.info("The specUser {} has send Inbox times is {}" , specUid , inboxIntelTimes);
                     });
-                    uidList.removeAll(needSendList);
-                    sendBatchInbox(addReqList);
+                    if(addReqList.size() > 0){
+                        sendBatchInbox(addReqList);
+                    }
 
                 }
             }