注册员工 1.3

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -227,18 +227,13 @@ namespace OASystem.API.Controllers
             #endregion
 
 
-            var userData = _loginRep.Register(_loginRep, dto);
+            var userData = _loginRep.Register(dto);
             if (userData.Result.Code != 0)
             {
-                if (userData.Result.Code != 0) { return Ok(JsonView(false, userData.Result.Msg)); }
-
                 return Ok(JsonView(false, "注册失败!"));
             }
 
-           
-
-
-            return Ok(new { Code = 0, Msg = userData.Result.Msg });
+            return Ok(JsonView(true, userData.Result.Msg));
         }
 
         /// <summary>

OASystem/OASystem.Domain/Dtos/UserDto/RegisterDto.cs

@@ -15,7 +15,7 @@ namespace OASystem.Domain.Dtos.UserDto
         /// <summary>
         /// 申请注册UserId
         /// </summary>
-        public int CreateUserId { get; set; }
+        public int CreateUserId { get; set; } = 0;
 
         /// <summary>
         /// 中文名
@@ -51,12 +51,12 @@ namespace OASystem.Domain.Dtos.UserDto
         /// <summary>
         /// 密码
         /// </summary>
-        public int Password { get; set; }
+        public string? Password { get; set; }
 
         /// <summary>
         /// 现在居住住址
         /// </summary>
-        public string Address { get; set; }
+        public string? Address { get; set; }
 
         /// <summary>
         /// 身份证号
@@ -83,6 +83,7 @@ namespace OASystem.Domain.Dtos.UserDto
         /// <summary>
         /// 教育类型
         /// 统招/成教
+        /// 0 统招  1 成教
         /// </summary>
         public int EducationType { get; set; }
 
@@ -120,6 +121,6 @@ namespace OASystem.Domain.Dtos.UserDto
         /// <summary>
         /// 入职时间
         /// </summary>
-        public DateTime Edate  { get; set; }
+        public string? Edate  { get; set; }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Login/LoginRepository.cs

@@ -94,7 +94,7 @@ namespace OASystem.Infrastructure.Repositories.Login
         /// <param name="_loginRep"></param>
         /// <param name="registerDto"></param>
         /// <returns></returns>
-        public async Task<Result> Register(LoginRepository _loginRep, RegisterDto registerDto)
+        public async Task<Result> Register( RegisterDto registerDto)
         {
             Result result = new Result();
 
@@ -115,7 +115,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                 UrgentPhone = registerDto.UrgencyPhone,
                 Email = registerDto.Email,
                 Address = registerDto.Address,
-                Edate = DateTime.Now,  //入职时间默认当前数据提交时间
+                Edate = Convert.ToDateTime(registerDto.Edate),  //入职时间默认当前数据提交时间
                 Rdate = new DateTime(1990, 1, 1),  //离职时间默认最原始时间
                 Seniority = 0, //工龄默认 0
                 Birthday = Convert.ToDateTime(birthDay),
@@ -136,7 +136,8 @@ namespace OASystem.Infrastructure.Repositories.Login
                 Remark = "",         //备注
                 IsDel = 0
             };
-            var _AddId = await _loginRep.AddAsyncReturnId(_userInfo);
+
+            var _AddId = await _sqlSugar.Insertable(_userInfo).ExecuteReturnIdentityAsync();
             if (_AddId < 0)
             {
                 result.Code = -2;
@@ -145,6 +146,11 @@ namespace OASystem.Infrastructure.Repositories.Login
                 return result;
             }
 
+            _userInfo.CreateUserId = _AddId;
+
+            var updateStatus = await _sqlSugar.Updateable(_userInfo).UpdateColumns(it => new { it.CreateUserId }).Where(it => it.Id == _AddId).ExecuteCommandAsync();
+
+
             result.Code = 0;
             result.Msg = "申请成功!人事主管审核后且信息部经理分配了登录账号,可登录OA!";
             return result;