diff --git a/Api/Ewide.Core/Service/User/ISysUserService.cs b/Api/Ewide.Core/Service/User/ISysUserService.cs index f712b30..7066ff0 100644 --- a/Api/Ewide.Core/Service/User/ISysUserService.cs +++ b/Api/Ewide.Core/Service/User/ISysUserService.cs @@ -6,7 +6,7 @@ namespace Ewide.Core.Service { public interface ISysUserService { - Task AddUser(AddUserInput input); + Task AddUser(AddUserInput input); Task ChangeUserStatus(UpdateUserInput input); Task DeleteUser(DeleteUserInput input); Task ExportUser([FromQuery] UserInput input); diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs index 48ab4ad..b6eb055 100644 --- a/Api/Ewide.Core/Service/User/SysUserService.cs +++ b/Api/Ewide.Core/Service/User/SysUserService.cs @@ -91,10 +91,10 @@ namespace Ewide.Core.Service /// [HttpPost("/sysUser/add")] [UnitOfWork] - public async Task AddUser(AddUserInput input) + public async Task AddUser(AddUserInput input) { // 数据范围检查 - CheckDataScope(input); + await CheckDataScope(input); var isExist = await _sysUserRep.AnyAsync(u => u.Account == input.Account, false); if (isExist) throw Oops.Oh(ErrorCode.D1003); @@ -105,10 +105,14 @@ namespace Ewide.Core.Service user.Name = user.Account; if (string.IsNullOrEmpty(user.NickName)) user.NickName = user.Account; - var newUser = await _sysUserRep.InsertNowAsync(user); - input.SysEmpParam.Id = newUser.Entity.Id.ToString(); + var id = Guid.NewGuid().ToString(); + user.Id = id; + await _sysUserRep.InsertAsync(user); + input.SysEmpParam.Id = id; // 增加员工信息 await _sysEmpService.AddOrUpdate(input.SysEmpParam); + + return id; } /// @@ -125,7 +129,7 @@ namespace Ewide.Core.Service throw Oops.Oh(ErrorCode.D1014); // 数据范围检查 - CheckDataScope(input); + await CheckDataScope(input); // 直接删除用户 await user.DeleteAsync(); @@ -150,7 +154,7 @@ namespace Ewide.Core.Service public async Task UpdateUser(UpdateUserInput input) { // 数据范围检查 - CheckDataScope(input); + await CheckDataScope(input); // 排除自己并且判断与其他是否相同 var isExist = await _sysUserRep.AnyAsync(u => u.Account == input.Account && u.Id != input.Id, false); @@ -207,7 +211,7 @@ namespace Ewide.Core.Service public async Task GrantUserRole(UpdateUserInput input) { // 数据范围检查 - CheckDataScope(input); + await CheckDataScope(input); await _sysUserRoleService.GrantRole(input); } @@ -220,7 +224,7 @@ namespace Ewide.Core.Service public async Task GrantUserData(UpdateUserInput input) { // 数据范围检查 - CheckDataScope(input); + await CheckDataScope(input); await _sysUserDataScopeService.GrantData(input); } @@ -380,6 +384,7 @@ namespace Ewide.Core.Service /// /// [NonAction] + [UnitOfWork] public async Task> GetUserDataScopeIdList(string userId) { var dataScopes = await _sysCacheService.GetDataScope(userId); // 先从缓存里面读取 @@ -420,7 +425,7 @@ namespace Ewide.Core.Service /// /// /// - private async void CheckDataScope(UserInput userParam) + private async Task CheckDataScope(UserInput userParam) { // 如果当前用户不是超级管理员,则进行数据范围校验 if (!_userManager.SuperAdmin) diff --git a/Web/src/assets/style/lib/list.less b/Web/src/assets/style/lib/list.less index 324a1ce..89e4a38 100644 --- a/Web/src/assets/style/lib/list.less +++ b/Web/src/assets/style/lib/list.less @@ -25,4 +25,7 @@ } } } + >.ant-pagination { + margin: @padding-md 0; + } } diff --git a/Web/src/assets/style/lib/table.less b/Web/src/assets/style/lib/table.less index 48ca825..335fbf5 100644 --- a/Web/src/assets/style/lib/table.less +++ b/Web/src/assets/style/lib/table.less @@ -125,6 +125,10 @@ } } } + + .ant-table-pagination { + float: none; + } } .yo-table-actions { diff --git a/Web/src/components/yoList/index.js b/Web/src/components/yoList/index.js index b532d75..68dd3d1 100644 --- a/Web/src/components/yoList/index.js +++ b/Web/src/components/yoList/index.js @@ -99,12 +99,21 @@ export default { - - {Object.keys(this.$slots).map((name) => ( - - ))} - - +
+ + {Object.keys(this.$slots).map((name) => ( + + ))} + + { + !!this.data && !!this.data.length && + } +
) },