xingzai před 7 měsíci
rodič
revize
28316b7318
1 změnil soubory, kde provedl 31 přidání a 16 odebrání
  1. 31 16
      controllers/yanxuan_special_message.go

+ 31 - 16
controllers/yanxuan_special_message.go

@@ -166,22 +166,6 @@ func (this *YanxuanSpecialMessageController) MessageManageList() {
 			userIds = append(userIds, v.UserId)
 		}
 
-		//用户头像
-		listUser, err := models.GetWxUserListByUserIdsArr(userIds)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败, Err:" + err.Error()
-			return
-		}
-		mapUserImg := make(map[int]string)
-		for _, v := range listUser {
-			if v.Headimgurl != "" {
-				mapUserImg[v.UserId] = v.Headimgurl
-			} else {
-				mapUserImg[v.UserId] = utils.DefaultHeadimgurl
-			}
-		}
-
 		//获取子集评论
 		conditionChildren += `  AND  parent_id  IN (` + utils.GetOrmInReplace(len(messageIds)) + `) ORDER BY message_id	  ASC `
 		pars = append(pars, messageIds)
@@ -194,13 +178,36 @@ func (this *YanxuanSpecialMessageController) MessageManageList() {
 
 		itemChildMap := make(map[int][]*models.CygxYanxuanSpecialMessageManageChildResp)
 		for _, v := range listChild {
+			userIds = append(userIds, v.UserId)
 			itemChild := new(models.CygxYanxuanSpecialMessageManageChildResp)
+			itemChild.UserId = v.UserId
 			itemChild.MessageId = v.MessageId
 			itemChild.Content = v.Content
 			itemChild.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
 			itemChildMap[v.ParentId] = append(itemChildMap[v.ParentId], itemChild)
 		}
 
+		//用户头像
+		listUser, err := models.GetWxUserListByUserIdsArr(userIds)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败, Err:" + err.Error()
+			return
+		}
+		mapUserImg := make(map[int]string)
+		for _, v := range listUser {
+			if v.Headimgurl != "" {
+				mapUserImg[v.UserId] = v.Headimgurl
+			} else {
+				mapUserImg[v.UserId] = utils.DefaultHeadimgurl
+			}
+		}
+		for _, v := range userIds {
+			if mapUserImg[v] == "" {
+				mapUserImg[v] = utils.DefaultHeadimgurl
+			}
+		}
+
 		for _, v := range list {
 			item := new(models.CygxYanxuanSpecialMessageManageResp)
 			item.MessageId = v.MessageId
@@ -212,6 +219,9 @@ func (this *YanxuanSpecialMessageController) MessageManageList() {
 			item.SourceTitle = v.SourceTitle
 			item.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
 			if len(itemChildMap[v.MessageId]) > 0 {
+				for _, vm := range itemChildMap[v.MessageId] {
+					vm.Headimgurl = mapUserImg[vm.UserId]
+				}
 				item.ChildList = itemChildMap[v.MessageId]
 			} else {
 				item.ChildList = make([]*models.CygxYanxuanSpecialMessageManageChildResp, 0)
@@ -570,6 +580,11 @@ func (this *YanxuanSpecialMessageController) MessageSpecialList() {
 				mapUserImg[v.UserId] = utils.DefaultHeadimgurl
 			}
 		}
+		for _, v := range userIds {
+			if mapUserImg[v] == "" {
+				mapUserImg[v] = utils.DefaultHeadimgurl
+			}
+		}
 
 		for _, v := range listMyself {
 			item := new(models.CygxYanxuanSpecialMessageManageResp)