From 7e88ceb3f3758b4ea47acb055167e66c5b913398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=AF=E7=82=AF?= <hou_jiong@163.com>
Date: Wed, 16 Jul 2025 15:49:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=91=E5=9E=8B=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 侯炯 <hou_jiong@163.com>
---
 .../wwwroot/template/service_Service.cs.vm      | 17 +++++++++++------
 .../wwwroot/template/web_views_TreeList.vue.vm  |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm
index 62af52a6..552dce4a 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm
@@ -333,19 +333,24 @@ if(@column.EffectType == "Upload"){
     @:public async Task<SysFile> Upload@(@column.PropertyName)([Required] IFormFile file)
     @:{
             @:var service = App.GetRequiredService<SysFileService>();
-            @:return await service.UploadFile(new UploadFileInput { File = file }, "upload/@(@column.PropertyName)" ); 
+            @:return await service.UploadFile(new UploadFileInput { File = file},   "upload/@(@column.PropertyName)" ); 
     @:} 
 }
 }
 
 @foreach (var column in Model.TableField){
+ 
 if(@column.EffectType == "ApiTreeSelector" && !definedObjects.ContainsKey("@(@column.FkEntityName)Tree")){
-    @{definedObjects.Add("@(@column.FkEntityName)Tree", 1);}    
-    @:[ApiDescriptionSettings(Name = "@(LowerFirstLetter(@column.FkEntityName))Tree", Description = "获取@(@column.ColumnComment)列表", Order = 920), HttpGet]
-    @:[DisplayName("获取@(@column.FkEntityName)Tree")]
-    @:public async Task<dynamic> @(@column.FkEntityName)Tree()
+    @:/// <summary>
+    @:/// 获取@(@Model.BusName)树列表
+    @:/// </summary>
+    @:/// <param name="input"></param>
+    @:/// <returns></returns>
+    @:[ApiDescriptionSettings(Name = "GetTreeList", Description = "获取@(@Model.BusName)树列表", Order = 960), HttpPost]
+    @:[DisplayName("获取@(@Model.BusName)树列表")]
+    @:public async Task<dynamic> GetTreeList()
     @:{
-        @:return await _@(@Model.LowerClassName)Rep.Context.Queryable<@(@column.FkEntityName)>().Select<@(@column.FkEntityName)Output>().ToTreeAsync(u => u.Children, u => u.@(@column.PidColumn), 0);
+        @:return await _@(@Model.LowerClassName)Rep.AsQueryable().OrderBy(u => new { u.OrderNo, u.Id }).ToTreeAsync(u => u.Children, u => u.Pid, 0, u => u.Id);    
     @:}
 }
 }
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm
index 1ba2199d..f781c7b9 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_TreeList.vue.vm
@@ -267,6 +267,7 @@ const userStore = useUserInfo();
 @:const dc = userStore.getDictItemByValue;
 @:const dv = userStore.getDictItemByLabel;
 @:const dl = userStore.getDictDataByCode;
+}
 
 // 变量
 const state = reactive({