页面修改

Edu.Model/ViewModel/System/RB_Role_ViewModel.cs

@@ -5,6 +5,20 @@
     /// </summary>
     public class RB_Role_ViewModel : Model.Entity.System.RB_Role
     {
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
 
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateDateStr
+        {
+            get
+            {
+                return Common.ConvertHelper.FormatTime(this.CreateDate);
+            }
+        }
     }
 }

Edu.Module.System/RoleModule.cs

@@ -54,6 +54,7 @@ namespace Edu.Module.System
                     {nameof(RB_Role_ViewModel.RoleName),model.RoleName.Trim() },
                     {nameof(RB_Role_ViewModel.RoleIntro),model.RoleIntro },
                     {nameof(RB_Role_ViewModel.RoleAuth),model.RoleAuth },
+                    {nameof(RB_Role_ViewModel.Status),model.Status },
                 };
                 flag = roleRepository.Update(fileds, new WhereHelper(nameof(RB_Role_ViewModel.RoleId), model.RoleId));
             }

Edu.Repository/System/RB_RoleRepository.cs

@@ -67,12 +67,12 @@ SELECT *
 FROM rb_role
 WHERE 1=1 
 ");
-            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.Group_Id), query.Group_Id);
             if (query != null)
             {
-                if (query.Group_Id > 0)
+                if (query.Status >= 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.Group_Id), query.Group_Id);
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.Status), (int)query.Status);
                 }
                 if (query.School_Id > 0)
                 {

Edu.WebApi/Controllers/Public/PublicController.cs

 using System;
+using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.System;
@@ -138,7 +139,16 @@ namespace Edu.WebApi.Controllers.Public
         {
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Role_ViewModel>(RequestParm.Msg.ToString());
+            query.Group_Id = base.UserInfo.Group_Id;
+            query.School_Id = base.UserInfo.School_Id;
             var list = roleModule.GetRolePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+            }
             pageModel.Count = rowsCount;
             pageModel.PageData = list;
             return ApiResult.Success(data: pageModel);