diff --git a/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs b/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs index 63cfb824..2f9295bd 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Interface/IUserService.cs @@ -56,7 +56,7 @@ public interface IUserService /// 查询客户端 用户拥有的菜单权限 /// /// - public Task>> GetClientUserPermissions(); + public Task>> GetClientUserPermissions(string id); /// diff --git a/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs b/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs index cdddd38f..0a9e7012 100644 --- a/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs +++ b/ds-wms-service/DS.WMS.Core/Sys/Method/UserService.cs @@ -279,11 +279,11 @@ public class UserService : IUserService /// 查询客户端 用户拥有的菜单权限 /// /// - public async Task>> GetClientUserPermissions() + public async Task>> GetClientUserPermissions(string id) { List list = new List(); - var userId = long.Parse(user.UserId); + var userId = long.Parse(id); var userInfo = await db.Queryable().Where(x => x.Id == userId).FirstAsync(); diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs index e13fa0b8..14351c69 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/UserController.cs @@ -105,9 +105,9 @@ public class UserController : ApiController /// [HttpGet] [Route("GetClientUserPermissions")] - public async Task>> GetClientUserPermissions() + public async Task>> GetClientUserPermissions([FromQuery] string id) { - var res = await _invokeService.GetClientUserPermissions(); + var res = await _invokeService.GetClientUserPermissions(id); return res; } @@ -118,6 +118,7 @@ public class UserController : ApiController /// [HttpGet] [Route("GetDataRuleListByPermission")] + [Obsolete] public async Task>> GetDataRuleListByPermission([FromQuery] string permissionId) { var res = await _invokeService.GetDataRuleListByPermission(permissionId);