diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index 4c02d23..83ab222 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -88,7 +88,7 @@ namespace _24Hour.Controllers.system
             //获取部门信息
             var Departlist = await _db.Queryable<App_Sys_DepartModel>().Where(q => q.IsDelete == 0).ToListAsync();
             //获取角色信息
-            var RoleModel = _db.Queryable<App_Sys_RoleUserModel>().LeftJoin<App_Sys_RoleModel>((o, i) => o.roleId == i.Id && o.IsDelete == 0&&i.IsDeleted == 0).Select((o,i)=> new App_Sys_RoleDto {Id=o.roleId,name=i.name,userId=o.roleuserId  }).ToList();
+            var RoleModel = _db.Queryable<App_Sys_RoleUserModel>().LeftJoin<App_Sys_RoleModel>((o, i) => o.roleId == i.Id && o.IsDelete == 0 && i.IsDeleted == 0).Select((o, i) => new App_Sys_RoleDto { Id = o.roleId, name = i.name, userId = o.roleuserId }).ToList();
             var list = await _db.Queryable<App_Sys_UserModel>()
                 .WhereIF(!UserModel.name.IsNull(), q => q.name.Contains(UserModel.name))
                 .WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone))
@@ -119,7 +119,7 @@ namespace _24Hour.Controllers.system
                     q.createtime,
                     unitname = Unitdata?.unitname,
                     departname = Departdata?.departname,
-                    roleId = RoleModel.FirstOrDefault(x=>x.userId==q.Id)?.Id,
+                    roleId = RoleModel.FirstOrDefault(x => x.userId == q.Id)?.Id,
                     roleName = RoleModel.FirstOrDefault(x => x.userId == q.Id)?.name,
                 });
             });
@@ -146,7 +146,9 @@ namespace _24Hour.Controllers.system
                 .WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties))
                 .WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId))
                 .WhereIF(UserModel.audit != null, q => q.audit == UserModel.audit)
-                .Where(q => q.IsDeleted == 0 && q.usertype == 1).ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber);
+                .WhereIF(UserModel.isdeactivate >=0, q => q.isdeactivate == UserModel.isdeactivate)
+                .Where(q => q.IsDeleted == 0 && q.usertype == 1)
+                .ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber);
             UserModel.RowsCount = totalNumber;
             var data = new QueryResult<App_Sys_UserModel>(UserModel, list);
             result.IsSucceed = true;
@@ -287,7 +289,7 @@ namespace _24Hour.Controllers.system
                 //判断角色不等于空进
                 if (!string.IsNullOrEmpty(UserModel.roleId))
                 {
-                    if (_db.Queryable<App_Sys_RoleUserModel>().Any(x =>x.IsDelete == 0&& x.roleuserId == UserModel.Id))
+                    if (_db.Queryable<App_Sys_RoleUserModel>().Any(x => x.IsDelete == 0 && x.roleuserId == UserModel.Id))
                     {
                         //查询角色用户是否存在
                         var rolemodel = await _db.Queryable<App_Sys_RoleUserModel>().Where(x => x.IsDelete == 0 && x.roleuserId == UserModel.Id).FirstAsync();
@@ -1508,23 +1510,24 @@ namespace _24Hour.Controllers.system
         {
             var list = new List<dynamic>();
             //获取父级菜单
-            var pidlist = await _db.Queryable<App_Sys_MenuModel>().Where(q => q.IsDelete == 0&&string.IsNullOrEmpty(q.pid)).ToListAsync();
+            var pidlist = await _db.Queryable<App_Sys_MenuModel>().Where(q => q.IsDelete == 0 && string.IsNullOrEmpty(q.pid)).ToListAsync();
             //联表查询该用户菜单
-            var menulist = await _db.Queryable<App_Sys_RoleUserModel>().Where(x=> x.roleuserId == _userdata.Id)
+            var menulist = await _db.Queryable<App_Sys_RoleUserModel>().Where(x => x.roleuserId == _userdata.Id)
      .LeftJoin<App_Sys_RoleMenuModel>((o, cus) => o.roleId == cus.roleId)
-     .LeftJoin<App_Sys_MenuModel>((o, cus, menu) => cus.menuId== menu.Id)
+     .LeftJoin<App_Sys_MenuModel>((o, cus, menu) => cus.menuId == menu.Id)
      .Where((o, cus, menu) => o.IsDelete == 0 && cus.IsDelete == 0 && menu.IsDelete == 0)
      .Select((o, cus, menu) => menu)
      .ToListAsync();
-            if (_userdata.phone=="admin") 
+            if (_userdata.phone == "admin")
             {
                 menulist = await _db.Queryable<App_Sys_MenuModel>().Where(x => x.IsDelete == 0).ToListAsync();
             }
             //通过分组父级菜单
-            var datalist = menulist.OrderBy(q=>q.sortnum).GroupBy(q => q.pid).Select(q => new { pid = q.Key, dalist = q.OrderBy(q=>q.sortnum).ToList() }).ToList();
-            if (datalist.Count>0) 
+            var datalist = menulist.OrderBy(q => q.sortnum).GroupBy(q => q.pid).Select(q => new { pid = q.Key, dalist = q.OrderBy(q => q.sortnum).ToList() }).ToList();
+            if (datalist.Count > 0)
             {
-                pidlist.OrderBy(q => q.sortnum).ToList().ForEach(item => {
+                pidlist.OrderBy(q => q.sortnum).ToList().ForEach(item =>
+                {
                     var data = datalist.Where(q => q.pid == item.Id).FirstOrDefault();
                     var childrenlist = new List<dynamic>();
                     if (data != null)
@@ -1550,8 +1553,8 @@ namespace _24Hour.Controllers.system
                         });
                     }
 
-                    var fjdata = datalist.Where(q => string.IsNullOrEmpty(q.pid)).FirstOrDefault()?.dalist.FirstOrDefault(q=>q.Id== item.Id);
-                    if (childrenlist.Count>0|| fjdata!=null) 
+                    var fjdata = datalist.Where(q => string.IsNullOrEmpty(q.pid)).FirstOrDefault()?.dalist.FirstOrDefault(q => q.Id == item.Id);
+                    if (childrenlist.Count > 0 || fjdata != null)
                     {
                         //添加父级菜单
                         list.Add(new