fix:培训考试资料详情的学习记录添加用户名字段

model/learning/learning_material.go

@@ -27,8 +27,8 @@ type LearningMaterialGetReq struct {
 
 type LearningMaterialGetRsp struct {
 	LearningMaterial
-	File           []*LearningMaterialFile   `json:"file"`
-	LearningRecord []*LearningLearningRecord `json:"learningRecord"`
+	File           []*LearningMaterialFile         `json:"file"`
+	LearningRecord []*LearningLearningRecordGetRsp `json:"learningRecord"`
 }
 
 type LearningMaterialAddReqFile struct {

service/learning/material.go

@@ -17,6 +17,7 @@ type LearningMaterialService struct {
 	Dao               *dao.LearningMaterialDao
 	FileDao           *dao.LearningMaterialFileDao
 	LearningRecordDao *dao.LearningLearningRecordDao
+	LearningRecordSrv *LearningLearningRecordService
 	Tenant            string
 	userInfo          request.UserInfo
 }
@@ -31,10 +32,15 @@ func NewLearningMaterialService(ctx context.Context) (*LearningMaterialService,
 	if err != nil {
 		return nil, fmt.Errorf("获取用户信息异常：%s", err.Error())
 	}
+	lrSrv, err := NewLearningLearningRecordService(ctx)
+	if err != nil {
+		return nil, err
+	}
 	return &LearningMaterialService{
 		Dao:               dao.NewLearningMaterialDao(tenant),
 		FileDao:           dao.NewLearningMaterialFileDao(tenant),
 		LearningRecordDao: dao.NewLearningLearningRecordDao(tenant),
+		LearningRecordSrv: lrSrv,
 		Tenant:            tenant,
 		userInfo:          userInfo,
 	}, nil
@@ -61,7 +67,10 @@ func (s LearningMaterialService) Get(ctx context.Context, req *learning.Learning
 	if err != nil {
 		return nil, err
 	}
-	record, err := s.LearningRecordDao.Where("MaterialId = ?", m.Id).All()
+	_, record, err := s.LearningRecordSrv.List(ctx, &learning.LearningLearningRecordListReq{MaterialId: req.Id})
+	if err != nil {
+		return nil, err
+	}
 
 	return &learning.LearningMaterialGetRsp{
 		LearningMaterial: *m,