页面修改

Edu.Module.User/NoticeModule.cs

@@ -206,28 +206,44 @@ namespace Edu.Module.User
             {
                 model.FileList = JsonHelper.DeserializeObject<List<FileModel>>(model.File);
             }
+            string DayStr = "";
+            if (model.UpdateTime != null)
+            {
+                DayStr = Common.Plugin.StringHelper.DateFormatToString(Convert.ToDateTime(model.UpdateTime));
+            }
+            var empModel = new RB_Account_ViewModel();
+            if (model.UpdateBy > 0)
+            {
+                empModel= accountRepository.GetAccountListExtRepository(new Model.ViewModel.User.RB_Account_ViewModel()
+                         {
+                             Id = model.UpdateBy
+                         })?.FirstOrDefault();
+            }
             return ApiResult.Success("", new
             {
                 model.Id,
                 model.From,
-                model.To,
-                DepartmentList,
-                model.CopyPeople,
-                CopyPeopleList,
                 model.Number,
                 model.Title,
+                model.NoticeState,
+                NoticeStateName = model.NoticeState.ToName(),
+                model.Is_Top,
+                model.To,
+                toList= DepartmentList,
+                model.CopyPeople,
+                ccList=CopyPeopleList,
                 model.Content,
-                FileList = model.FileList.Select(x => new
+                fileList=  model.FileList.Select(x => new
                 {
                     x.FileName,
                     x.FileUrl
                 }),
-                model.NoticeState,
-                NoticeStateName = model.NoticeState.ToName(),
-                model.Is_Top,
                 model.UpdateBy,
-                UpdateTime = model.UpdateTime.HasValue ? model.UpdateTime.Value.ToString("yyyy年MM月dd日") : ""
-            });
+                UpdateByName = empModel?.AccountName ?? "",
+                UpdateByIcon = empModel?.UserIcon ?? "",
+                UpdateTime = model.UpdateTime.HasValue ? model.UpdateTime.Value.ToString("yyyy年MM月dd日") : "",
+                DayStr
+            }); 
         }
 
         /// <summary>

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -197,7 +197,6 @@ namespace Edu.WebApi.Controllers.User
             {
                 return ApiResult.ParamIsNull("请传递公告id");
             }
-
             return noticeModule.GetNoticeInfo(NoticeId);
         }