解决op费用录入冲突

OASystem/OASystem.Domain/Entities/System/Sys_Users.cs

@@ -101,8 +101,8 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 开始工作时
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime? StartWorkDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string? StartWorkDate { get; set; }
         /// <summary>
         /// 毕业学校
         /// </summary>

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

@@ -27,7 +27,7 @@ namespace OASystem.Infrastructure.Repositories.Login
         public async Task<Result> Login(LoginDto loginDto)
         {
             Result result = new Result() { Code = -2 };
-            string SQLWhere = string.Format("Where Number='{0}'", loginDto.Number);
+            string SQLWhere = string.Format("Where Number='{0}' And Isdel = 0", loginDto.Number);
             string sql = string.Format("Select * From Sys_Users With(NoLock) {0}", SQLWhere);
             Sys_Users _entity = await GetSingleInfoBySqlWithNolockAsync(sql);
 
@@ -37,7 +37,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                 return result;
             }
 
-            if (_entity.Password != loginDto.Password)
+            if (!_entity.Password.Equals(loginDto.Password))
             {
                 result.Msg = "账户或密码错误!";
                 return result;
@@ -132,7 +132,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                 Seniority = 0, //工龄默认 0
                 Birthday = Convert.ToDateTime(birthDay),
                 IDCard = registerDto.IdCrad,
-                StartWorkDate = new DateTime(1990, 1, 1),  //开始工作时间默认最原始时间
+                StartWorkDate = "1900-01-01 00:00:00.000",  //开始工作时间默认最原始时间
                 GraduateInstitutions = registerDto.GraduationSchhol,
                 Professional = registerDto.Major,
                 Education = registerDto.Education, //学历类型