diff --git a/Controllers/WhitListController.cs b/Controllers/WhitListController.cs
index 701c27b..0728a63 100644
--- a/Controllers/WhitListController.cs
+++ b/Controllers/WhitListController.cs
@@ -30,7 +30,7 @@ namespace LY.App.Controllers
///
///
[HttpGet("list")]
- public async Task List(int pageNum, int pageSize, string key)
+ public async Task List(int pageNum = 1, int pageSize = 10, string key = null)
{
var result = await _whitListService.GetList(pageNum, pageSize, key);
return Ok(result);
diff --git a/Model/Whitelist.cs b/Model/Whitelist.cs
index 859223f..151bd85 100644
--- a/Model/Whitelist.cs
+++ b/Model/Whitelist.cs
@@ -20,9 +20,11 @@ namespace LY.App.Model
public DateTime? startTime { get; set; }
[SugarColumn(IsNullable = true)]
public DateTime? endTime { get; set; }
- [JsonConverter(typeof(ValueToStringConverter))]
+
[SugarColumn(ColumnName = "position_id", ColumnDescription = "阵地id", IsJson = true)]
public List positionId { get; set; }
+ [SugarColumn(IsIgnore = true)]
+ public List positionIds { get; set; }
///
/// 所属单位
///
diff --git a/Service/WhitListService.cs b/Service/WhitListService.cs
index efad679..0515406 100644
--- a/Service/WhitListService.cs
+++ b/Service/WhitListService.cs
@@ -22,7 +22,7 @@ namespace LY.App.Service
public WhitListService(SqlSugarClient sqlSugarClient, RedisService redisService)
{
_db = sqlSugarClient;
- _redisService=redisService;
+ _redisService = redisService;
}
///
/// 新增白名单
@@ -69,7 +69,7 @@ namespace LY.App.Service
///
///
///
- public async Task GetList(int pageNum, int pageSize, string key)
+ public async Task GetList(int pageNum = 1, int pageSize = 10, string key = null)
{
var result = new ApiResult();
RefAsync total = 0;
@@ -78,6 +78,10 @@ namespace LY.App.Service
.WhereIF(!string.IsNullOrEmpty(key), s => s.sn.Contains(key))
.OrderByDescending(s => s.Id)
.ToPageListAsync(pageNum, pageSize, total);
+ items.ForEach(x =>
+ {
+ x.positionIds = x.positionId.Select(s => s.ToString()).ToList();
+ });
return new ApiResult()
{
data = new