页面修改

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -1094,7 +1094,6 @@ namespace Edu.Module.EduTask
                         }
                         #endregion
                     }
-
                     #endregion
 
                     #region 更新审核关联表状态

Edu.Module.Log/LogModule.cs

@@ -17,6 +17,20 @@ namespace Edu.Module.Log
         /// </summary>
         private readonly RB_MsgLogRepository msgLogRepository = new RB_MsgLogRepository();
 
+
+        /// <summary>
+        /// 获取推送日志分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_MsgLog> GetMsgLogPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_MsgLog query)
+        {
+            return msgLogRepository.GetMsgLogPageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
         /// <summary>
         /// 获取消息推送列表
         /// </summary>

Edu.Repository/Log/RB_MsgLogRepository.cs

@@ -63,7 +63,7 @@ WHERE 1=1
         /// <param name="rowsCount"></param>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_MsgLog> GetMsgLogPageListRepository(int pageIndex,int pageSize,out long rowsCount, RB_MsgLog query)
+        public List<RB_MsgLog> GetMsgLogPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_MsgLog query)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 

Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs

@@ -148,13 +148,9 @@ namespace Edu.WebApi.Controllers.EduTask
                 RemunerationState = base.ParmJObj.GetInt("RemunerationState"),
             };
             var flag = educationReceiptModule.AduitEducationReceiptModule(auditModel, base.UserInfo, out string message);
-            
-
-            
             return flag?ApiResult.Success():ApiResult.Failed(message: message);
         }
 
-
         /// <summary>
         /// 获取单据类型
         /// </summary>

Edu.WebApi/Controllers/Public/PublicController.cs

@@ -56,6 +56,32 @@ namespace Edu.WebApi.Controllers.Public
         /// </summary>
         private readonly LogModule logModule = AOP.AOPHelper.CreateAOPObject<LogModule>();
 
+        /// <summary>
+        /// 获取日志列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetMsgLogPage()
+        {
+            var userInfo = base.UserInfo;
+            var pageModel = new ResultPageModel()
+            {
+                PageIndex = base.ParmJObj.GetInt("PageIndex"),
+                PageSize = base.ParmJObj.GetInt("PageSize"),
+            };
+            var query = new Model.Entity.Log.RB_MsgLog()
+            {
+                AppId = Common.Config.PushAppId,
+                IsRead = 0,
+                ReceiveId = userInfo.Id.ToString(),
+                Platform = 2
+            };
+            var list = logModule.GetMsgLogPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            pageModel.Count = rowsCount;
+            pageModel.PageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
         #region 省市区
 
         [HttpPost]

Edu.WebApi/Controllers/User/LoginController.cs

@@ -112,7 +112,6 @@ namespace Edu.WebApi.Controllers.User
             int autoLoginId = jobj.GetInt("AutoLoginId",0);
             var workId = jobj.GetStringValue("AutoLoginWorkId");
             var openId = jobj.GetStringValue("AutoLoginOpenId");
-            Common.Plugin.LogHelper.WriteInfo("Login::Query __" + Common.Plugin.JsonHelper.Serialize(jobj));
             //新增自动登录功能，用于通过推送消息自动登录
             RB_Account_ViewModel model = null;
             if (autoLoginId == 0 && (string.IsNullOrEmpty(workId) && string.IsNullOrEmpty(openId)))