提交代码

Mall.Module.Education/DynamicModule.cs

@@ -447,7 +447,7 @@ namespace Mall.Module.Education
                         Type = Common.Enum.MiAi.MessageTypeEnum.CircleReply,
                         UserId = article.CreateBy ?? 0,
                         SourceId = comment.ArticleId,
-                        Content = Common.Plugin.StringHelper.FromUnicodeString( comment.Content),
+                        Content = Common.Plugin.StringHelper.FromUnicodeString(comment.Content),
                         Status = 0,
                         TenantId = comment.TenantId,
                         MallBaseId = comment.MallBaseId,
@@ -549,22 +549,41 @@ namespace Mall.Module.Education
         public List<Rb_Education_Dynamic_Extend> GetMiAiAllDynamicList(Rb_Education_Dynamic_Extend model)
         {
             List<Rb_Education_Dynamic_Extend> articleList = new List<Rb_Education_Dynamic_Extend>();
-            articleList = articleRepository.GetMiAiAllDynamicList( model);
+            articleList = articleRepository.GetMiAiAllDynamicList(model);
             DecoratorDynameicArticle(articleList);
             return articleList;
         }
 
 
 
-            /// <summary>
-            /// 动态详情
-            /// </summary>
-            /// <param name="empId">员工id</param>
-            /// <param name="articleId">动态id</param>
-            /// <returns></returns>
-            public Rb_Education_Dynamic_Extend GetMiAiDynamicDetial(Rb_Education_Dynamic_Extend model)
+        /// <summary>
+        /// 动态详情
+        /// </summary>
+        /// <param name="empId">员工id</param>
+        /// <param name="articleId">动态id</param>
+        /// <returns></returns>
+        public Rb_Education_Dynamic_Extend GetMiAiDynamicDetial(Rb_Education_Dynamic_Extend model)
         {
-            return articleRepository.GetMiAiDynamicDetial(model);
+            Rb_Education_Dynamic_Extend article = articleRepository.GetMiAiDynamicDetial(model);
+            if (article == null)
+            {
+                return article;
+            }
+            article.LikeList = likeRepository.GetDynamicLikeList(new Rb_Education_DynamicLike_Extend { ArticleId = article.Id });
+            article.CommentList = commentRepository.GetDynamicCommentList(new Rb_Education_DynamicComment_Extend { ArticleId = article.Id });
+            foreach (var common in article.CommentList)
+            {
+                if (common.CommentId != null && common.CommentId > 0)
+                {
+                    Rb_Education_DynamicComment_Extend byReplayCommon = article.CommentList.Where(t => t.Id == common.CommentId.Value).FirstOrDefault();
+                    if (byReplayCommon != null)
+                    {
+                        common.ByReplyEmName = byReplayCommon.UserName;
+                        common.ByReplyEmpId = byReplayCommon.UserId;
+                    }
+                }
+            }
+            return article;
         }