调整用户管理

Controllers/Base/SysUserController.cs

@@ -20,8 +20,6 @@ namespace Controllers
     /// 用户管理
     /// </summary>
     [Verify]
-    [Route("system/user")]
-    [ApiExplorerSettings(GroupName = "sys")]
     public class SysUserController : BaseController
     {
         private readonly ISysUserService UserService;
@@ -46,8 +44,7 @@ namespace Controllers
         /// /system/user/list
         /// </summary>
         /// <returns></returns>
-        [ActionPermissionFilter(Permission = "system:user:list")]
-        [HttpGet("list")]
+        [HttpGet("/v1/api/SysUser/list")]
         public IActionResult List([FromQuery] SysUserQueryDto user, PagerInfo pager)
         {
             var list = UserService.SelectUserList(user, pager);

Model/Dto/Base/SysUserDto.cs

@@ -40,18 +40,9 @@
 
     public class SysUserQueryDto
     {
-        public long? UserId { get; set; }
-        public string UserName { get; set; }
-        public string NickName { get; set; }
-        public string Email { get; set; }
-        public string Remark { get; set; }
-        public string Phonenumber { get; set; }
-        /// <summary>
-        /// 用户性别（0男 1女 2未知）
-        /// </summary>
-        public int Sex { get; set; }
-        public DateTime? BeginTime { get; set; }
-        public DateTime? EndTime { get; set; }
-        public long DeptId { get; set; }
+        public string? username { get; set; }
+        public string? nickname { get; set; }
+        public string? name { get; set; }
+        public string? phone { get; set; }
     }
 }

Services/Base/SysUserService.cs

@@ -40,18 +40,11 @@ namespace Services
         public PagedInfo<SysUser> SelectUserList(SysUserQueryDto user, PagerInfo pager)
         {
             var exp = Expressionable.Create<SysUser>();
-            exp.AndIF(!string.IsNullOrEmpty(user.UserName), u => u.Username.Contains(user.UserName));
-            exp.AndIF(user.UserId > 0, u => u.UserId == user.UserId);
-            exp.AndIF(user.BeginTime != DateTime.MinValue && user.BeginTime != null, u => u.CreateTime >= user.BeginTime);
-            exp.AndIF(user.EndTime != DateTime.MinValue && user.EndTime != null, u => u.CreateTime <= user.EndTime);
+            exp.AndIF(!string.IsNullOrEmpty(user.username), u => u.Username.Contains(user.username));
+            exp.AndIF(!string.IsNullOrEmpty(value: user.nickname), u => u.Username.Contains(user.nickname));
+            exp.AndIF(!string.IsNullOrEmpty(user.name), u => u.Username.Contains(user.name));
+            exp.AndIF(!string.IsNullOrEmpty(user.phone), u => u.Username.Contains(user.phone));
             exp.And(u => u.DelFlag == "0");
-
-            if (user.DeptId != 0)
-            {
-                var allChildDepts = Context.Queryable<SysDept>().ToChildList(it => it.ParentId, user.DeptId);
-
-                exp.And(u => allChildDepts.Select(f => f.DeptId).ToList().Contains(u.DeptId));
-            }
             var query = Queryable()
                 .LeftJoin<SysDept>((u, dept) => u.DeptId == dept.DeptId)
                 .Where(exp.ToExpression())