diff --git a/OpenAuth.App/BaseApp/SysGroupManager/SysGroupApp.cs b/OpenAuth.App/BaseApp/SysGroupManager/SysGroupApp.cs index fc57c8b..4baf3d6 100644 --- a/OpenAuth.App/BaseApp/SysGroupManager/SysGroupApp.cs +++ b/OpenAuth.App/BaseApp/SysGroupManager/SysGroupApp.cs @@ -91,7 +91,13 @@ namespace OpenAuth.App.BaseApp.SysGroupManager }; } //更新数据 - await uwo.SysGroup.UpdateAsync(group); + await uwo.SysGroup.UpdateSetColumnsTrueAsync(a => new SysGroup + { + Name = group.Name, + GroupLeaderId = group.GroupLeaderId, + GroupLeaderName = group.GroupLeaderName, + Remark = group.Remark + }, a => a.Id == id); //将组长添加中间表 SysGroupuser gu = new SysGroupuser(); @@ -190,5 +196,35 @@ namespace OpenAuth.App.BaseApp.SysGroupManager }; } } + + /// + /// 获取小组下的成员信息 + /// + /// + /// + /// + /// + /// + public async Task>>> LoadUserListByGroupid(string groupid,string keyword, int pageindex, int pagesize) + { + //定义且实例化分页数据 + RefAsync totalCount = 0; + //数据查询并返回 + var info = await client.Queryable() + .Where(r=>r.GroupId==groupid) + .LeftJoin((r,u)=>r.UserId==u.Id.ToString()) + .WhereIF(!string.IsNullOrEmpty(keyword), (r, u) => u.Name.Contains(keyword)) + .OrderBy((r, u) => u.Name) + .Select((r,u)=>u) + .ToPageListAsync(pageindex, pagesize, totalCount); + return new Response>> + { + Result = new PageInfo> + { + Items = info, + Total = totalCount + } + }; + } } } diff --git a/OpenAuth.WebApi/Controllers/BaseControllers/SysGroupController.cs b/OpenAuth.WebApi/Controllers/BaseControllers/SysGroupController.cs index bcf2b7d..f0f7654 100644 --- a/OpenAuth.WebApi/Controllers/BaseControllers/SysGroupController.cs +++ b/OpenAuth.WebApi/Controllers/BaseControllers/SysGroupController.cs @@ -108,5 +108,20 @@ namespace OpenAuth.WebApi.Controllers.BaseControllers } return result; } + + + /// + /// 根据小组id,获取成员信息 + /// + /// 小组id + /// 用户名筛选 + /// 当前页 + /// 每页条数 + /// + [HttpGet] + public async Task>>> LoadUserListByGroupid(string groupid, string keyword, int page, int limit) + { + return await _app.LoadUserListByGroupid(groupid,keyword, page, limit); + } } }