From f577f3b0d8709dd2f7364f78536a4f32bb6b8cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 17 Jun 2023 09:49:18 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=8F=AF=E5=90=88=E5=B9=B6=E5=B7=B2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/System/SysDictDataController.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs index 2631348..a3cab52 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -38,6 +38,14 @@ namespace ZR.Admin.WebApi.Controllers.System public IActionResult List([FromQuery] SysDictData dictData, [FromQuery] PagerInfo 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); } @@ -75,7 +83,7 @@ namespace ZR.Admin.WebApi.Controllers.System }; 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); }