fix:最新通知消息修改

rpc/internal/logic/usermsglistlogic.go

@@ -32,38 +32,34 @@ func (l *UserMsgListLogic) UserMsgList(in *message.UserMsgListReq) (*message.Use
 	data := new(message.UserMsgListRes)
 	res1 := service.UserMsgList(in)    //具体信息
 	res2 := service.MessageGetLast(in) //最新信息
-	if res2 != nil || res1 != nil {
-		var finalData []*message.Messages
-		if res1.Data != nil {
-			for _, v := range res1.Data {
-				link3, androidUrl3, iosUrl3, weChatUrl3 := util.LinkSplit(v.Link)
-				v.Link = link3
-				v.Url = map[string]string{
-					"androidUrl": androidUrl3,
-					"iosUrl":     iosUrl3,
-					"weChatUrl":  weChatUrl3,
-				}
-				finalData = append(finalData, v)
+	var finalData []*message.Messages
+	if res1 != nil && res1.Data != nil {
+		for _, v := range res1.Data {
+			link3, androidUrl3, iosUrl3, weChatUrl3 := util.LinkSplit(v.Link)
+			v.Link = link3
+			v.Url = map[string]string{
+				"androidUrl": androidUrl3,
+				"iosUrl":     iosUrl3,
+				"weChatUrl":  weChatUrl3,
 			}
+			finalData = append(finalData, v)
 		}
-
-		lastMsg := new(message.Messages)
-		if res2 != nil {
-			lastMsg = res2
-			links4 := lastMsg.Link
-			link4, androidUrl4, iosUrl4, weChatUrl4 := util.LinkSplit(links4)
-			lastMsg.Link = link4
-			lastMsg.Url = map[string]string{
-				"androidUrl": androidUrl4,
-				"iosUrl":     iosUrl4,
-				"weChatUrl":  weChatUrl4,
-			}
+	}
+	if res2 != nil {
+		links4 := res2.Link
+		link4, androidUrl4, iosUrl4, weChatUrl4 := util.LinkSplit(links4)
+		res2.Link = link4
+		res2.Url = map[string]string{
+			"androidUrl": androidUrl4,
+			"iosUrl":     iosUrl4,
+			"weChatUrl":  weChatUrl4,
 		}
-		data.Column = res1.SortData
-		data.List = finalData
-		data.Last = lastMsg
-		data.Count = res1.Count
-		data.Unread = res1.Unread
 	}
+
+	data.Column = res1.SortData
+	data.List = finalData
+	data.Last = res2
+	data.Count = res1.Count
+	data.Unread = res1.Unread
 	return data, nil
 }