页面修改

Edu.Module.User/NoticeModule.cs

@@ -50,18 +50,10 @@ namespace Edu.Module.User
         /// </summary>
         /// <param name="group_Id"></param>
         /// <returns></returns>
-        public object GetNoticeBaseInfo(int group_Id)
+        public RB_Notice_Base_ViewModel GetNoticeBaseInfo(int group_Id)
         {
             var model = notice_BaseRepository.GetList(new RB_Notice_Base_ViewModel() { Group_Id = group_Id }).FirstOrDefault();
-            return new
-            {
-                model?.Id,
-                model?.Image,
-                model?.From,
-                model?.NumberRule,
-                NumberRuleName = model?.NumberRule.ToName(),
-                model?.CopyPeople
-            };
+            return model;
         }
 
         /// <summary>

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -102,8 +102,17 @@ namespace Edu.WebApi.Controllers.User
         [HttpPost]
         public ApiResult GetNoticeBaseInfo()
         {
-            var Robj = noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
-            return ApiResult.Success("", Robj);
+            var model = noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
+            var obj = new
+            {
+                model?.Id,
+                model?.Image,
+                model?.From,
+                model?.NumberRule,
+                NumberRuleName = model?.NumberRule.ToName(),
+                model?.CopyPeople
+            };
+            return ApiResult.Success("", obj);
         }
 
         /// <summary>
@@ -327,6 +336,7 @@ namespace Edu.WebApi.Controllers.User
             query.Group_Id = base.UserInfo.Group_Id;
             query.DeptId = base.UserInfo.DeptId;
             query.NoticeState = NoticeStateEnum.Publish;
+            var noticeBaseModel=noticeModule.GetNoticeBaseInfo(base.UserInfo.Group_Id);
             var list = noticeModule.GetMyNoticePageList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             List<object> result = new List<object>();
             foreach (var item in list)
@@ -391,13 +401,14 @@ namespace Edu.WebApi.Controllers.User
                     item.UpdateBy,
                     UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "",
                     UpdateByIcon = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.UserIcon ?? "",
-                    UpdateTime =Common.ConvertHelper.FormatDate2(item.UpdateTime),
+                    UpdateTime = Common.ConvertHelper.FormatDate2(item.UpdateTime),
                     UpdateTimeStr = Common.ConvertHelper.FormatTime(item.UpdateTime),
                     item.Content,
                     fileList,
                     ccList,
                     toList,
                     DayStr,
+                    BgImage = noticeBaseModel?.Image ?? "",
                 };
                 result.Add(obj);
             }