Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Repository/Log/RB_Notice_LogRepository.cs

@@ -6,7 +6,7 @@ using Edu.Model.Entity.Log;
 
 namespace Edu.Repository.Log
 {
-  public  class RB_Notice_LogRepository:BaseRepository<RB_Notice_Log>
+    public class RB_Notice_LogRepository : BaseRepository<RB_Notice_Log>
     {
         /// <summary>
         /// 获取公告日志分页列表
@@ -63,6 +63,7 @@ WHERE 1=1
                 School_Id = model.School_Id,
                 CreateBy = model.CreateBy,
                 CreateTime = DateTime.Now,
+                ReviewStatus = model.ReviewStatus
             };
             return base.Insert(newmodel) > 0;
         }

Edu.Repository/User/RB_NoticeRepository.cs

@@ -224,10 +224,10 @@ ORDER BY {OrderBy}";
                 where += $@" and b.{nameof(RB_Notice.Number)} LIKE @Number ";
                 parameters.Add("Number", "%" + demodel.Number.Trim() + "%");
             }
-            if (demodel.NoticeState > 0)
-            {
-                where += $@" and b.{nameof(RB_Notice.NoticeState)} ={(int)demodel.NoticeState}";
-            }
+            //if (demodel.NoticeState > 0)
+            //{
+            //    where += $@" and b.{nameof(RB_Notice.NoticeState)} ={(int)demodel.NoticeState}";
+            //}
             if (demodel.Is_Top > 0)
             {
                 where += $@" and b.{nameof(RB_Notice.Is_Top)} ={demodel.Is_Top}";

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -399,6 +399,7 @@ namespace Edu.WebApi.Controllers.User
             {
                 LogContent = LogContent,
                 NoticeId = NoticeId,
+                ReviewStatus= ReviewStatus,
                 Group_Id = userInfo.Group_Id,
                 School_Id = userInfo.School_Id,
                 CreateBy = userInfo.Id,