From 5399034accbccaeb2148337d585df379e70b368a Mon Sep 17 00:00:00 2001
From: wx <wx036@qq.com>
Date: 星期日, 08 一月 2023 12:25:44 +0800
Subject: [PATCH] 调整参数

---
 GasolineBlend/Controllers/SysController.cs |    4 ++--
 Pissa.Service/DbService/SysService.cs      |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/GasolineBlend/Controllers/SysController.cs b/GasolineBlend/Controllers/SysController.cs
index df03479..c4814e9 100644
--- a/GasolineBlend/Controllers/SysController.cs
+++ b/GasolineBlend/Controllers/SysController.cs
@@ -74,9 +74,9 @@
         /// <param name="param">鏉′欢</param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult GetIpcClassTree(ParamIpcTree param)
+        public ActionResult GetIpcClassTree(int year,string json)
         {
-            var res = _countryService.GetIpcClassTree(param);
+            var res = _countryService.GetIpcClassTree(year,json);
             return SuccessNoShow(data: res);
         }
 
diff --git a/Pissa.Service/DbService/SysService.cs b/Pissa.Service/DbService/SysService.cs
index c84554c..117276a 100644
--- a/Pissa.Service/DbService/SysService.cs
+++ b/Pissa.Service/DbService/SysService.cs
@@ -49,20 +49,20 @@
         /// </summary>
         /// <param name="param">鏉′欢</param>
         /// <returns></returns>
-        public List<IviewTree> GetIpcClassTree(ParamIpcTree param)
+        public List<IviewTree> GetIpcClassTree(int year,string json)
         {
             var whereList = new List<IConditionalModel>();
             try
             {
-                if (!string.IsNullOrWhiteSpace(param.JsonConditional))
-                    whereList = Context.Utilities.JsonToConditionalModels(param.JsonConditional);
+                if (!string.IsNullOrWhiteSpace(json))
+                    whereList = Context.Utilities.JsonToConditionalModels(json);
             }
             catch (Exception e)
             {
                 throw new Exception("鏉′欢璁剧疆閿欒锛岃妫�鏌�");
             }
             var res = Context.Queryable<SysIpcClass>()
-                .Where(a => a.Year == param.Year)
+                .Where(a => a.Year == year)
                 .Where(whereList)
                 .OrderBy(a => a.Sort1).OrderBy(a => a.Sort2)
                 .ToList();

--
Gitblit v1.8.0