fix userId --> userNo
This commit is contained in:
@@ -59,11 +59,11 @@ public class SettingController : ControllerBase
|
||||
/// <summary>
|
||||
/// 获取用户配置
|
||||
/// </summary>
|
||||
/// <param name="userId"></param>
|
||||
/// <param name="userNo"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("user")]
|
||||
public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userId)
|
||||
public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userNo)
|
||||
{
|
||||
return await _settingService.GetUserSettingAsync(userId);
|
||||
return await _settingService.GetUserSettingAsync(userNo);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,8 @@ public interface ICanteenSettingService : IScopeDependency
|
||||
/// <summary>
|
||||
/// 获取人员的就餐配置信息
|
||||
/// </summary>
|
||||
/// <param name="userId">就餐人员档案号</param>
|
||||
/// <param name="userNo">就餐人员档案号</param>
|
||||
/// <returns></returns>
|
||||
Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userId);
|
||||
Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userNo);
|
||||
}
|
||||
|
||||
|
||||
@@ -72,10 +72,10 @@ public class CanteenSettingService : ICanteenSettingService
|
||||
}
|
||||
|
||||
|
||||
public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userId)
|
||||
public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userNo)
|
||||
{
|
||||
var setting = await _context.Queryable<CanteenSettingEntity>()
|
||||
.Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Person && (x.UniqueValue == userId) || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant)
|
||||
.Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Person && (x.UniqueValue == userNo) || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant)
|
||||
.ToListAsync();
|
||||
|
||||
//从基地 -> 个人,确保下面循环做到覆盖,并且以个人配置为主
|
||||
|
||||
Reference in New Issue
Block a user