diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserEntity.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserEntity.cs index db38418f1..6a5fac76c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserEntity.cs @@ -240,6 +240,11 @@ namespace Learun.Application.Organization /// [Column("F_MODIFYPWDDATE")] public DateTime? F_ModifyPwdDate { get; set; } + /// + /// 账户 + /// + [Column("N_ACCOUNT")] + public string N_Account { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs index 7e1da8b36..84319a5aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs @@ -39,7 +39,7 @@ namespace Learun.Application.Organization strSql.Append("SELECT "); strSql.Append(fieldSql); strSql.Append(" FROM LR_Base_User t "); - strSql.Append(" WHERE t.F_Account = @account AND t.F_DeleteMark = 0 "); + strSql.Append(" WHERE (t.F_Account = @account or t.N_Account=@account) AND t.F_DeleteMark = 0 "); return this.BaseRepository().FindEntity(strSql.ToString(), new { account = account }); } catch (Exception ex) @@ -206,7 +206,7 @@ namespace Learun.Application.Organization if (!string.IsNullOrEmpty(keyword)) { keyword = "%" + keyword + "%"; - strSql.Append(" AND( t.F_Account like @keyword or t.F_RealName like @keyword or t.F_Mobile like @keyword ) "); + strSql.Append(" AND( t.F_Account like @keyword or t.F_RealName like @keyword or t.N_Account like @keyword or t.F_Mobile like @keyword ) "); } return this.BaseRepository().FindList(strSql.ToString(), new { companyId, departmentId, keyword }, pagination); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 0c6bf6530..1ddb442ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -449,6 +449,7 @@ sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Bi } UserEntity userbase = new UserEntity(); userbase.F_Account = tEntity.EmpNo; + userbase.N_Account = tEntity.EmpNo; userbase.F_RealName = tEntity.EmpName; userbase.F_EnCode = tEntity.EmpNo; userbase.F_Password = Md5Helper.Encrypt(defaultpwd, 32).ToLower();