Преглед на файлове

提交因特殊字段数据类型导致的错误

Master преди 2 години
родител
ревизия
bd43733eee
променени са 1 файла, в които са добавени 9 реда и са изтрити 4 реда
  1. 9 4
      Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

+ 9 - 4
Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm

@@ -73,13 +73,14 @@ if (@column.QueryWhether == "Y"){
     }
             @:.Select((@(@joinTableName))=> new @(@Model.ClassName)Output{
 @foreach (var column in Model.TableField){
-                @:@(@column.PropertyName) = u.@(@column.PropertyName), 
                 if(@column.EffectType == "fk"){   
+                @:@(@column.PropertyName) = u.@(@column.PropertyName), 
                 @:@(@column.PropertyName)@(@column.FkColumnName) = @(@column.PropertyName.ToLower()).@(@column.FkColumnName),
-                } else if(@column.EffectType == "ApiTreeSelect"){   
+                } else if(@column.EffectType == "ApiTreeSelect"){  
+                @:@(@column.PropertyName) = u.@(@column.PropertyName),  
                 @:@(@column.PropertyName)@(@column.DisplayColumn) = @(@column.PropertyName.ToLower()).@(@column.DisplayColumn),
                 } else if(@column.NetType?.TrimEnd('?').EndsWith("Enum") == true){
-                @:@(@column.PropertyName)@(@column.DisplayColumn) = u.@(@column.PropertyName),
+                @:@(@column.PropertyName) = (@(@column.NetType))u.@(@column.PropertyName),
                 } else {
                 @:@(@column.PropertyName) = u.@(@column.PropertyName),
                 }
@@ -112,7 +113,11 @@ if (@column.QueryWhether == "Y"){
     }
 }
 }
-        query = query.OrderBuilder(input, "", "CreateTime");
+        @if(Model.IsJoinTable){
+        @:query = query.OrderBuilder(input, "", "u.CreateTime");
+        }else{
+        @:query = query.OrderBuilder(input, "", "CreateTime");
+        }
         return await query.ToPagedListAsync(input.Page, input.PageSize);
     }