Merge branch 'dev/v1.2.6_dx' of SocialPlatform/messageCenter into feature/v1.2.6

service/message_mail_box.go

@@ -139,7 +139,7 @@ func (b MessaggeService) UserList(in *messagecenter.UserReq) (data *[]map[string
 							"" as groupMember
 						FROM
 							socialize_summary a
-							INNER JOIN base_position b ON ( a.my_position_id = %d %s  AND a.your_position_id = b.id AND a.chat_group_id = 0 )
+							INNER JOIN base_position b ON ( a.my_position_id = %d %s  AND a.your_position_id = b.id)
 							INNER JOIN base_user c ON ( b.user_id = c.id )
 							LEFT JOIN socialize_message d ON ( a.message_id = d.id )
 							ORDER BY a.timestamp DESC LIMIT 0,500
@@ -182,9 +182,9 @@ func (b MessaggeService) UserList(in *messagecenter.UserReq) (data *[]map[string
 							b.groupMember
 						FROM
 							socialize_summary a
-							INNER JOIN %s b ON ( a.my_position_id = %d AND a.chat_group_id > 0 AND a.chat_group_id = b.id)
+							INNER JOIN %s b ON ( a.my_position_id = %d AND a.chat_group_id = b.id)
 							LEFT JOIN socialize_message d ON ( a.message_id = d.id ) 
-						ORDER BY c.timestamp DESC LIMIT 0,500
+						ORDER BY a.timestamp DESC LIMIT 0,500
 						) `, GroupNameSql, in.PositionId)
 		if oneSql != "" {
 			sqlArr = append(sqlArr, oneSql)