diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs index 2784e366..6661887f 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasSupplierContact.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Text; using JNPF.Common.Security; using SqlSugar; +using Yitter.IdGenerator; namespace Tnb.BasicData.Entities { diff --git a/system/Tnb.Systems/System/DataBaseService.cs b/system/Tnb.Systems/System/DataBaseService.cs index bd1d1a4a..0ea80fe0 100644 --- a/system/Tnb.Systems/System/DataBaseService.cs +++ b/system/Tnb.Systems/System/DataBaseService.cs @@ -601,6 +601,7 @@ public class DataBaseService : IDynamicApiController, ITransient List dirs = new List(); foreach (string key in nsMapper.Keys) { + if (key != "eqp_") continue; var nsName = nsMapper[key]; var dir = Path.Combine(FileVariable.GenerateCodePath, nsName); dirs.Add(dir); @@ -661,7 +662,11 @@ public class DataBaseService : IDynamicApiController, ITransient if (sugarAttrs.Count > 0) sugarColumnStr = $"\r\n [SugarColumn({string.Join(", ", sugarAttrs)})]"; var txt = tpl.Replace("{PropertyType}", type).Replace("{PropertyName}", col.DbColumnName).Replace("{SugarColumn}", sugarColumnStr); - if (col.DbColumnName == "id") txt = txt.TrimEnd('\n', '\r') + " = SnowflakeIdHelper.NextId();\r\n"; + if (col.DbColumnName == "id") + { + if(type == "string") txt = txt.TrimEnd('\n', '\r') + " = SnowflakeIdHelper.NextId();\r\n"; + else if(type == "long") txt = txt.TrimEnd('\n', '\r') + " = YitIdHelper.NextId();\r\n"; + } else if (type == "string") txt = txt.TrimEnd('\n', '\r') + " = string.Empty;\r\n"; return txt; })