fix version 1

module/social/group/internal/logic/member/join_fetch.go

@@ -2,6 +2,7 @@ package member
 
 import (
 	"context"
+	"time"
 
 	"bsm/full/module/social/group/internal/impl"
 	"bsm/full/module/social/group/internal/models"
@@ -18,27 +19,37 @@ func JoinFetch(ctx context.Context, in *pb.Empty) (reply *pb.JoinFetchReply, err
 		return nil, err
 	}
 
-	fetch := make([]*pb.ApplyJoinGroupItem, 0)
+	applys := make([]*pb.ApplyJoinGroupItem, 0)
 	group_ids := models.GetMasterGroup(auth.ID)
 	if len(group_ids) > 0 {
-		err = impl.DBService.Model(&models.GroupApply{}).Where("group_id in ", group_ids).Find(&fetch).Error
-		if err != nil {
+		var records []models.GroupApply
+		if err = impl.DBService.Model(&models.GroupApply{}).Where("group_id in ?", group_ids).Find(&records).Error; err != nil {
 			printer.Error(err.Error())
 			return nil, errcode.ErrDB
 		}
-		var card = &pb.PassportInfoDetailCard{}
-		for idx, item := range fetch {
-			err = impl.DBService.Table("passport_extend").Select(filed).Where("passport_identity = ?", item.From.Identity).First(card).Error
-			if err != nil {
-				printer.Error(err.Error())
-				return nil, errcode.ErrDB
+		for i := range records {
+			item := &pb.ApplyJoinGroupItem{
+				Identity:  records[i].Identity,
+				GroupId:   int64(records[i].GroupID),
+				Message:   records[i].Message,
+				CreatedAt: records[i].CreatedAt.Format(time.DateTime),
+				Status:    int32(records[i].Status),
 			}
-			fetch[idx].From = card
+			// 每条申请单独分配资料卡，避免所有元素共用同一指针
+			card := &pb.PassportInfoDetailCard{}
+			if e := impl.DBService.Table("passport_extend").Select(filed).
+				Where("passport_identity = ?", records[i].FromIdentity).First(card).Error; e != nil {
+				printer.Error(e.Error())
+				// 申请人资料查不到时跳过该条，避免整份列表不可用
+				continue
+			}
+			item.From = card
+			applys = append(applys, item)
 		}
 	}
 
 	return &pb.JoinFetchReply{
-		Total:  int32(len(fetch)),
-		Applys: fetch,
+		Total:  int32(len(applys)),
+		Applys: applys,
 	}, nil
 }