|
|
@@ -627,18 +627,18 @@ func (b MessaggeService) FindMessage(in *messagecenter.MessageReq) *[]map[string
|
|
|
case 2: //点对点聊天
|
|
|
sqlStr = fmt.Sprintf("SELECT a.messag_id as messageId,b.* ,if(a.own_id = a.send_user_id,1,2) as fool "+
|
|
|
"FROM %s a "+
|
|
|
- "LEFT JOIN %s b on a.messag_id=b.id "+
|
|
|
- "LEFT JOIN %s c on c.id=a.send_user_id "+
|
|
|
- "LEFT JOIN %s d on d.id=a.receive_user_id "+
|
|
|
- "where a.own_id= %d and a.iswithdraw = 0"+
|
|
|
- "AND ((a.send_user_id= %d AND a.receive_user_id= %d) or (a.send_user_id= %d AND a.receive_user_id= %d)) "+
|
|
|
+ "LEFT JOIN %s b on a.messag_id=b.id "+
|
|
|
+ "LEFT JOIN %s c on c.id=a.send_user_id "+
|
|
|
+ "LEFT JOIN %s d on d.id=a.receive_user_id "+
|
|
|
+ "where a.own_id= %d and a.iswithdraw = 0 "+
|
|
|
+ "AND ((a.send_user_id= %d AND a.receive_user_id= %d) or (a.send_user_id= %d AND a.receive_user_id= %d)) "+
|
|
|
"AND a.type IN ( 2, 6 ) %s "+
|
|
|
- "AND a.chat_group_id = 0 "+
|
|
|
+ "AND a.chat_group_id IS null "+
|
|
|
"AND a.send_user_type = a.receive_user_type "+
|
|
|
- "ORDER BY a.create_time desc,a.id asc "+
|
|
|
+ "ORDER BY a.create_time desc,a.id asc "+
|
|
|
"limit 0 , %d ",
|
|
|
util.SOCIALIZE_MESSAGE_MAILBOX, util.SOCIALIZE_MESSAGE, util.BASE_USER, util.BASE_USER,
|
|
|
- in.PositionId, in.PositionId, in.SendId, in.SendId, in.PositionId, lastStr, in.PageSize)
|
|
|
+ in.PositionId, in.PositionId, in.PositionId, in.SendId, in.PositionId, lastStr, in.PageSize)
|
|
|
break
|
|
|
case 3: //群聊天
|
|
|
|
