|
|
@@ -418,10 +418,14 @@ public class FriendDao {
|
|
|
// 过滤条件,content不为空,status ==2(好友) status==8(显示系统号)
|
|
|
PreparedQuery<Friend> preparedQuery = friendDao.queryBuilder()
|
|
|
.orderBy("timeSend", false)
|
|
|
- .where().eq("ownerId", ownerId).and()
|
|
|
- .isNotNull("content").and()
|
|
|
- .ge("status", Friend.STATUS_FRIEND).and()
|
|
|
- .le("status", Friend.STATUS_SYSTEM)
|
|
|
+ .where()
|
|
|
+ .eq("ownerId", ownerId)
|
|
|
+ .and().isNotNull("content")
|
|
|
+
|
|
|
+ .and().ge("status", Friend.STATUS_FRIEND)
|
|
|
+
|
|
|
+ .and().le("status", Friend.STATUS_SYSTEM)
|
|
|
+ //不处于新闻通知公告
|
|
|
.and().notIn("userId", Friend.ID_ERP_NEWS)
|
|
|
.and().notIn("userId", Friend.ID_ERP_GONGGAO)
|
|
|
.and().notIn("userId", Friend.ID_ERP_NOTICE)
|