优化Vue3&服务层代码生成模板

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt

@@ -6,6 +6,10 @@ using ${options.ModelsNamespace}.Dto;
 using ${options.ModelsNamespace}.Models;
 using ${options.IRepositoriesNamespace};
 using ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service;
+using System.Linq;
+$if(genTable.TplCategory == "tree")
+using System.Collections.Generic;
+$end
 
 namespace ${options.ServicesNamespace}.${options.SubNamespace}
 {
@@ -25,7 +29,7 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace}
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<${replaceDto.ModelTypeName}> GetList(${replaceDto.ModelTypeName}QueryDto parm)
+        public PagedInfo<${replaceDto.ModelTypeName}Dto> GetList(${replaceDto.ModelTypeName}QueryDto parm)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>();
@@ -33,7 +37,9 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace}
             //搜索条件查询语法参考Sqlsugar
 $foreach(column in genTable.Columns)
 $if(column.IsQuery)
-$if(column.CsharpType == "string")
+$if(column.HtmlType == "selectMulti")
+            predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => parm.${column.CsharpField}.Contains(it.${column.CsharpField}));
+$elseif(column.CsharpType == "string")
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
 $elseif(column.CsharpType == "DateTime")
             predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.AddDays(-1));
@@ -48,10 +54,10 @@ $if(null != genTable.SubTableName && "" != genTable.SubTableName)
                 .Includes(it => it.${genTable.SubTable.ClassName}.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
 $end
 $if(genTable.Options.SortField != "" && genTable.Options.SortField != null)
-                .OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}")
+                //.OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}")
 $end
                 .Where(predicate.ToExpression())
-                .ToPage(parm);
+                .ToPage<${replaceDto.ModelTypeName}, ${replaceDto.ModelTypeName}Dto>(parm);
 
             return response;
         }
@@ -78,12 +84,14 @@ $end
 $end
 $end
 
-            var response = Queryable().Where(predicate.ToExpression())
+            var response = Queryable()
+                .Where(predicate.ToExpression())
                 .ToTree(it => it.Children, it => it.${genTable.Options.TreeParentCode}, 0);
 
             return response;
         }
 $end
+
         /// <summary>
         /// 添加${genTable.FunctionName}
         /// </summary>