瀏覽代碼

😁完善增加表逻辑

zuohuaijun 2 年之前
父節點
當前提交
c8fc87d660

+ 1 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -36,7 +36,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.32.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.20.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.106-preview25" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.106-preview29" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.4" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 2 - 4
Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -128,7 +128,6 @@ public class SysDatabaseService : IDynamicApiController, ITransient
     [DisplayName("增加表")]
     public void AddTable(DbTableInput input)
     {
-        var columns = new List<DbColumnInfo>();
         if (input.DbColumnInfoList == null || !input.DbColumnInfoList.Any())
             throw Oops.Oh(ErrorCodeEnum.db1000);
 
@@ -141,11 +140,10 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         input.DbColumnInfoList.ForEach(m =>
         {
             var dbColumnName = config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(m.DbColumnName.Trim()) : m.DbColumnName.Trim();
-            var isPrimarykey = columns.Any(m => m.IsPrimarykey);
-            // 虚拟类都默认String,具体以列数据类型为准
+            // 虚拟类都默认string类型,具体以列数据类型为准
             typeBilder.CreateProperty(dbColumnName, typeof(string), new SugarColumn()
             {
-                IsPrimaryKey = isPrimarykey,
+                IsPrimaryKey = m.IsPrimarykey == 1,
                 IsIdentity = m.IsIdentity == 1,
                 ColumnDataType = m.DataType,
                 Length = m.Length,