提交代码

Mall.Module.Education/DynamicModule.cs

@@ -498,6 +498,8 @@ namespace Mall.Module.Education
             return articleList;
         }
 
+
+
         #endregion
     }
 }

Mall.Repository/Education/Rb_Education_DynamicRepository.cs

@@ -294,7 +294,7 @@ LEFT JOIN rb_member_user as mu on mu.Id=edc.UserId)
             return GetPage<Rb_Education_Dynamic_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
         /// <summary>
-        /// 老师动态列表
+        /// 动态列表（除教育外）
         /// </summary>
         /// <param name="empId">员工id</param>
         /// <param name="groupId">集团id</param>
@@ -329,7 +329,7 @@ LEFT JOIN rb_member_user as mu on mu.Id=edc.UserId)
                 if (model.UserId > 0)
                 {
                     likeWhere += $@" and l.UserId = {model.UserId} ";
-                    followWhere += $@" and b.UserId = {model.UserId} and b.`Status`=0 ";
+                    followWhere += $@" and (b.UserId = {model.UserId} and b.`Status`=0 or a.CreateBy = {model.UserId} ) ";
                 }
             }
             string sql = $@"SELECT t.*,if(l.Id>0,1,0) as HasLike,e.`Name` as CreateByName,e.Photo as CrearteByPhoto
@@ -344,5 +344,8 @@ union all SELECT a.TenantId,a.MallBaseId,a.CreateBy,a.id,a.UserTeacher,a.Content
         }
 
 
+
+      
+
     }
 }