diff --git a/Model/UserEntity.cs b/Model/UserEntity.cs index b530e9f..9ab48d8 100644 --- a/Model/UserEntity.cs +++ b/Model/UserEntity.cs @@ -41,6 +41,11 @@ namespace LY.App.Model /// 是否管理员,如果不是管理员,不可操作 /// public bool IsAdmin { get; set; } + /// + /// 用户关键防区数组 + /// + [SugarColumn(ColumnName = "position_id", ColumnDescription = "阵地ids", IsJson = true)] + public List positionId { get; set; } } public class AddUser { @@ -56,6 +61,7 @@ namespace LY.App.Model /// 是否管理员,如果不是管理员,不可操作 /// public bool IsAdmin { get; set; } + public List positionId { get; set; } } public class UpdateUser:AddUser { diff --git a/Service/UserService.cs b/Service/UserService.cs index ef9c47c..067d651 100644 --- a/Service/UserService.cs +++ b/Service/UserService.cs @@ -142,15 +142,17 @@ namespace LY.App.Service //加入redis await _redisService.SetAsync(RedisKeyList.TokenUser(input.username), token, TimeSpan.FromSeconds(60 * 60 * 24 * 7)); + var positionIds = entity.positionId?.Select(s => s.ToString()).ToList(); return new ApiResult() { code = 1, data = new { token, - expires = DateTime.UtcNow.AddSeconds(60*60*24*7), + expires = DateTime.UtcNow.AddSeconds(60 * 60 * 24 * 7), isAdmin = entity.IsAdmin, - userid = entity.Id.ToString() + userid = entity.Id.ToString(), + positionIds } }; }