Ver código fonte

恢复Entity自增长

jiangjc 2 anos atrás
pai
commit
c91bf82df4

+ 1 - 1
OASystem/OASystem.Api/Controllers/SystemController.cs

@@ -95,7 +95,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView),StatusCodes.Status200OK)]
         public async Task<IActionResult> AddCompany(AddCompanyDto dto)
         {
-            AddCompany _Company = _mapper.Map<AddCompany>(dto);
+            Sys_Company _Company = _mapper.Map<Sys_Company>(dto);
             int id = await _syscomRep.AddAsyncReturnId(_Company);
             return Ok(JsonView(0, "成功", _Company));
         }

+ 1 - 1
OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -18,7 +18,7 @@ namespace OASystem.Domain.AutoMappers
 
             #region 公司板块
             CreateMap<Sys_Company, CompanyIView>();
-            CreateMap<AddCompanyDto, AddCompany>();
+            CreateMap<AddCompanyDto, Sys_Company>();
             #endregion
 
             #region 部门板块

+ 19 - 27
OASystem/OASystem.Domain/Dtos/System/CompanyDto.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace OASystem.Domain.Dtos.System
@@ -14,29 +15,40 @@ namespace OASystem.Domain.Dtos.System
         /// <summary>
         /// 公司Code
         /// </summary>
-       
+
         public string CompanyCode { get; set; }
         /// <summary>
         /// 公司名称
         /// </summary>
-       
+
         public string CompanyName { get; set; }
 
         /// <summary>
         /// 公司所在地
         /// </summary>
-      
+
         public string Address { get; set; }
         /// <summary>
         /// 负责人Id
         /// </summary>
-     
+
         public int ContactUserId { get; set; }
         /// <summary>
         /// 联系方式
         /// </summary>
-      
-        public string Tel { get; set; }
+
+        private string tel;
+        public string Tel
+        {
+            get
+            {
+                return tel;
+            }
+            set
+            {
+                tel = value;
+            }
+        }
         /// <summary>
         /// 父级公司Id
         /// </summary>
@@ -45,27 +57,7 @@ namespace OASystem.Domain.Dtos.System
         /// <summary>
         /// 创建者Id
         /// </summary>
-       
+
         public int CreateUserId { get; set; }
-        ///// <summary>
-        ///// 创建时间
-        ///// </summary>
-        //public DateTime CreateTime { get; set; } = DateTime.Now;
-        ///// <summary>
-        ///// 删除者Id
-        ///// </summary>
-        //public int? DeleteUserId { get; set; }
-        ///// <summary>
-        ///// 删除时间
-        ///// </summary>
-        //public string DeleteTime { get; set; }
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-        ///// <summary>
-        ///// 是否删除
-        ///// </summary>
-        //public int IsDel { get; set; }
     }
 }

+ 1 - 1
OASystem/OASystem.Domain/Entities/EntityBase.cs

@@ -8,7 +8,7 @@
         /// <summary>
         /// 编号
         /// </summary>
-        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, /*IsIdentity = true,*/ IsNullable = false)]
+        [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true, IsIdentity = true, IsNullable = false)]
         public int Id { get; set; }
         /// <summary>
         /// 创建者Id