diff --git a/Api/Ewide.Core/Enum/ErrorCode.cs b/Api/Ewide.Core/Enum/ErrorCode.cs index d2d5f1e..b1d2fbe 100644 --- a/Api/Ewide.Core/Enum/ErrorCode.cs +++ b/Api/Ewide.Core/Enum/ErrorCode.cs @@ -137,7 +137,7 @@ namespace Ewide.Core /// /// 已有相同组织机构,编码或名称相同 /// - [ErrorCodeItemMetadata("已有相同组织机构,编码或名称相同")] + [ErrorCodeItemMetadata("已有相同编码组织机构")] D2002, /// diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 43d95a9..b506036 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -5557,11 +5557,6 @@ 名称 - - - 编码 - - 机构所在区域 diff --git a/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs b/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs index 5877936..a02c2cb 100644 --- a/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs +++ b/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs @@ -17,13 +17,14 @@ namespace Ewide.Core.Extension.DataFilter.WebPage protected IEnumerable OtherRangeFields; public DynamicParameters sqlParameters = new DynamicParameters(); - public SearchJsonFitlerInfoGetService(PageInputBase input, IEnumerable equalsFields, IEnumerable likeFields, IEnumerable dateRangeFields, IEnumerable otherRangeFields) + public SearchJsonFitlerInfoGetService(PageInputBase input, IEnumerable equalsFields, IEnumerable likeFields, IEnumerable dateRangeFields, IEnumerable otherRangeFields, object param = null) { Input = input; EqualsFields = equalsFields; LikeFields = likeFields; DateRangeFields = dateRangeFields; OtherRangeFields = otherRangeFields; + sqlParameters = new DynamicParameters(param); } diff --git a/Api/Ewide.Core/Extension/PageExtensions.cs b/Api/Ewide.Core/Extension/PageExtensions.cs index 04cb535..124643c 100644 --- a/Api/Ewide.Core/Extension/PageExtensions.cs +++ b/Api/Ewide.Core/Extension/PageExtensions.cs @@ -125,12 +125,12 @@ namespace Ewide.Core.Extension } #region DAPPER - public async static Task QueryPageDataDynamic(this IDapperRepository source, string baseSql, PageInputBase input, IEnumerable equalsFields = null, IEnumerable likeFields = null, IEnumerable dateTimeRangeFields = null, IEnumerable otherRangeFields = null, IDbTransaction transaction = null, int? commandTimeout = null, CommandType? commandType = null) + public async static Task QueryPageDataDynamic(this IDapperRepository source, string baseSql, PageInputBase input, object param = null, IEnumerable equalsFields = null, IEnumerable likeFields = null, IEnumerable dateTimeRangeFields = null, IEnumerable otherRangeFields = null, IDbTransaction transaction = null, int? commandTimeout = null, CommandType? commandType = null) { - SearchJsonFitlerInfoGetService searchJsonFitlerInfoGetService = new SearchJsonFitlerInfoGetService(input, equalsFields, likeFields, dateTimeRangeFields, otherRangeFields); + SearchJsonFitlerInfoGetService searchJsonFitlerInfoGetService = new SearchJsonFitlerInfoGetService(input, equalsFields, likeFields, dateTimeRangeFields, otherRangeFields, param); var sql = searchJsonFitlerInfoGetService.GetWhereSql(baseSql); - var param = searchJsonFitlerInfoGetService.sqlParameters; - return await QueryPageData(source, sql, input, param, transaction, commandTimeout, commandType); + var sqlParam = searchJsonFitlerInfoGetService.sqlParameters; + return await QueryPageData(source, sql, input, sqlParam, transaction, commandTimeout, commandType); } public async static Task QueryPageData(this IDapperRepository source, string sql, PageInputBase input, object param = null, IDbTransaction transaction = null, int? commandTimeout = null, CommandType? commandType = null) diff --git a/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs b/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs index 0c7a293..accb321 100644 --- a/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs +++ b/Api/Ewide.Core/Service/Org/Dto/OrgInput.cs @@ -65,11 +65,6 @@ namespace Ewide.Core.Service [Required(ErrorMessage = "机构名称不能为空")] public override string Name { get; set; } - /// - /// 编码 - /// - [Required(ErrorMessage = "机构编码不能为空")] - public override string Code { get; set; } /// /// 机构所在区域 /// diff --git a/Api/Ewide.Core/Service/Org/SysOrgService.cs b/Api/Ewide.Core/Service/Org/SysOrgService.cs index e5b7c29..ee7be0e 100644 --- a/Api/Ewide.Core/Service/Org/SysOrgService.cs +++ b/Api/Ewide.Core/Service/Org/SysOrgService.cs @@ -125,9 +125,12 @@ namespace Ewide.Core.Service [HttpPost("/sysOrg/add")] public async Task AddOrg(AddOrgInput input) { - var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Name == input.Name || u.Code == input.Code); - if (isExist) - throw Oops.Oh(ErrorCode.D2002); + if (!string.IsNullOrEmpty(input.Code)) + { + var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Code == input.Code); + if (isExist) + throw Oops.Oh(ErrorCode.D2002); + } if (!_userManager.SuperAdmin) { @@ -236,9 +239,12 @@ namespace Ewide.Core.Service if (!_userManager.SuperAdmin && (dataScopes.Count < 1 || !dataScopes.Contains(sysOrg.Id))) throw Oops.Oh(ErrorCode.D2003); - var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => (u.Name == input.Name || u.Code == input.Code) && u.Id != sysOrg.Id); - if (isExist) - throw Oops.Oh(ErrorCode.D2002); + if (!string.IsNullOrEmpty(input.Code)) + { + var isExist = await _sysOrgRep.DetachedEntities.AnyAsync(u => u.Code == input.Code && u.Id != sysOrg.Id); + if (isExist) + throw Oops.Oh(ErrorCode.D2002); + } // 如果名称有变化，则修改对应员工的机构相关信息 if (!sysOrg.Name.Equals(input.Name)) diff --git a/Web/src/assets/image/login-bg.jpg b/Web/src/assets/image/login-bg-00.jpg similarity index 100% rename from Web/src/assets/image/login-bg.jpg rename to Web/src/assets/image/login-bg-00.jpg diff --git a/Web/src/assets/image/login-bg-01.jpg b/Web/src/assets/image/login-bg-01.jpg new file mode 100644 index 0000000..3ae5f88 Binary files /dev/null and b/Web/src/assets/image/login-bg-01.jpg differ diff --git a/Web/src/assets/image/login-bg-02.jpg b/Web/src/assets/image/login-bg-02.jpg new file mode 100644 index 0000000..8ffb240 Binary files /dev/null and b/Web/src/assets/image/login-bg-02.jpg differ diff --git a/Web/src/assets/image/login-bg-03.jpg b/Web/src/assets/image/login-bg-03.jpg new file mode 100644 index 0000000..b0cdfe8 Binary files /dev/null and b/Web/src/assets/image/login-bg-03.jpg differ diff --git a/Web/src/assets/style/login.less b/Web/src/assets/style/login.less index 4186f46..a8307c5 100644 --- a/Web/src/assets/style/login.less +++ b/Web/src/assets/style/login.less @@ -6,8 +6,14 @@ width: 100%; height: 100%; + >img { + display: block; - background: url('~@/assets/image/login-bg.jpg') no-repeat center; + width: 100%; + height: 100%; + + object-fit: cover; + } &::before { position: absolute; top: 0; diff --git a/Web/src/views/login/index.vue b/Web/src/views/login/index.vue index daaca01..cdb2ccf 100644 --- a/Web/src/views/login/index.vue +++ b/Web/src/views/login/index.vue @@ -1,5 +1,6 @@