提交代码

Mall.Repository/Miai/RB_Miai_ActivityDiscussRepository.cs

@@ -24,20 +24,26 @@ namespace Mall.Repository.Miai
         public List<RB_Miai_ActivityDiscuss_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Miai_ActivityDiscuss_Extend dmodel)
         {
             string where = $" 1=1 and d.{nameof(RB_Miai_ActivityDiscuss_Extend.Status)}=0 ";
-            if (dmodel.TenantId > 0) {
+            if (dmodel.TenantId > 0)
+            {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.TenantId)}={dmodel.TenantId}";
             }
             if (dmodel.MallBaseId > 0)
             {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.MallBaseId)}={dmodel.MallBaseId}";
             }
-            if (dmodel.ActivityId > 0) {
+            if (dmodel.ActivityId > 0)
+            {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} ={dmodel.ActivityId}";
             }
             if (dmodel.UserId > 0)
             {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.UserId)} ={dmodel.UserId}";
             }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.Id)} ={dmodel.Id}";
+            }
             if (dmodel.ParentId > 0)
             {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} ={dmodel.ParentId}";
@@ -46,6 +52,7 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and d.{nameof(RB_Miai_ActivityDiscuss_Extend.ParentId)} =0";
             }
+           
             string sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName,b.Sex from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
@@ -74,7 +81,8 @@ where {where} order by d.Id asc";
             {
                 where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} ={dmodel.ActivityId}";
             }
-            if (!string.IsNullOrEmpty(dmodel.ActivityIds)) {
+            if (!string.IsNullOrEmpty(dmodel.ActivityIds))
+            {
                 where += $@" and {nameof(RB_Miai_ActivityDiscuss_Extend.ActivityId)} in({dmodel.ActivityIds})";
             }
             if (dmodel.UserId > 0)
@@ -99,33 +107,40 @@ where {where} order by d.Id asc";
         {
             int count = pidsList.Count();
             string sql = "";
-            if (count == 1) {
+            if (count == 1)
+            {
                 //只有一条数据
                 sql = $@"select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
 where d.Status =0 and d.ParentId ={pidsList.FirstOrDefault()} order by d.Id asc limit {number}";
             }
-            for (var i = 0; i < count; i++) {
-                if (i == count - 1)
+            else
+            {
+                for (var i = 0; i < count; i++)
                 {
-                    //最后一条
-                    sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+                    if (i == count - 1)
+                    {
+                        //最后一条
+                        sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
 where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id asc limit {number})";
-                }
-                else {
-                    sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
+                    }
+                    else
+                    {
+                        sql += $@"(select d.*,u.Name as UserName,u.Photo,u1.Name as ReplyUserName from RB_Miai_ActivityDiscuss d
 left join rb_member_user u on d.UserId = u.Id
 left join rb_member_user u1 on d.ReplyUserId = u1.Id
 where d.Status =0 and d.ParentId ={pidsList[i]} order by d.Id asc limit {number})
 union 
 ";
+                    }
                 }
             }
+
             return Get<RB_Miai_ActivityDiscuss_Extend>(sql).ToList();
-            
+
         }
 
         /// <summary>