格式调整

24Hour/Controllers/system/SystemControllerController.cs

@@ -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;
@@ -1524,7 +1526,8 @@ namespace _24Hour.Controllers.system
             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)