diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 9c25d0a6..54bdf24e 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -3503,6 +3503,29 @@ public partial class CommonServices : BaseServices>, ICommon string json = param.jsonParam.ToString(); var dict = JsonHelper.JsonToObj(json); var dict1 = JsonHelper.JsonToObj(json); + + #region 校验数据是否重复 + dict.Items.ForEach(x => + { + x.Year = dict1.Year; + }); + for (int i = 0; i < dict.Items.Count; i++) + { + var item = dict.Items[i]; + if (item.TitleId.IsNullOrEmpty()) + return ServiceResult.OprateFailed($"第{i + 1}行,岗位不可为空"); + if (item.JobId.IsNullOrEmpty()) + return ServiceResult.OprateFailed($"第{i + 1}行,职称不可为空"); + if (item.GradeId.IsNullOrEmpty()) + return ServiceResult.OprateFailed($"第{i + 1}行,职等不可为空"); + + if (await Db.Queryable().AnyAsync(x => x.Year == item.Year && x.JobId == item.JobId && x.GradeId == item.GradeId && x.JobId == item.GradeId)) + return ServiceResult.OprateFailed($" {item.Year}年度,已存在相同岗位、职等、职称数据!"); + } + #endregion + + + dict1.ApplicantId = GetStaffId(); dict1.ApplicantTime = DateTime.Now; id = await Db.Insertable(dict1).ExecuteReturnSnowflakeIdAsync(); diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs index deb036e1..e7cffb7a 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanApplyOrderServices.cs @@ -23,4 +23,5 @@ public class Ghrh_YearHumanApplyOrderServices : BaseServices.OprateSuccess("查询成功!", entity); } + } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs index 38f3f05b..78bc4b76 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs @@ -26,6 +26,9 @@ public class Ghrh_YearHumanSettingsServices : BaseServices().AnyAsync(x => x.Year == entity.Year && x.JobId == entity.JobId && x.GradeId == entity.GradeId && x.JobId == entity.GradeId)) + throw new Exception($" {entity.Year}年度,已存在相同岗位、职等、职称数据!"); + var result = await base.Add(entity); return result; @@ -559,7 +562,7 @@ public class Ghrh_YearHumanSettingsServices : BaseServices.OprateSuccess("导出成功", result); }