wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 自定义字典类型可合并已添加字典数据

Browse Source
This commit is contained in:
不做码农 2023-06-17 09:49:18 +08:00
parent 9d87d75a09
commit f577f3b0d8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs
View File

@ -38,6 +38,14 @@ namespace ZR.Admin.WebApi.Controllers.System
public IActionResult List([FromQuery] SysDictData dictData, [FromQuery] PagerInfo pagerInfo) public IActionResult List([FromQuery] SysDictData dictData, [FromQuery] PagerInfo pagerInfo)
{ {
var list = SysDictDataService.SelectDictDataList(dictData, pagerInfo); var list = SysDictDataService.SelectDictDataList(dictData, pagerInfo);
if (dictData.DictType.StartsWith("sql_"))
{
var result = SysDictService.SelectDictDataByCustomSql(dictData.DictType);
list.Result.AddRange(result);
list.TotalNum += result.Count;
}
return SUCCESS(list); return SUCCESS(list);
} }
@ -75,7 +83,7 @@ namespace ZR.Admin.WebApi.Controllers.System
}; };
if (dic.DictType.StartsWith("cus_") || dic.DictType.StartsWith("sql_")) if (dic.DictType.StartsWith("cus_") || dic.DictType.StartsWith("sql_"))
{ {
vo.List = SysDictService.SelectDictDataByCustomSql(dic.DictType); vo.List.AddRange(SysDictService.SelectDictDataByCustomSql(dic.DictType));
} }
dataVos.Add(vo); dataVos.Add(vo);
} }