转入待发Offer 新增是否存在录用审批校验

Tiobon.Core.Services/CommonServices.cs

@@ -3512,15 +3512,16 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                         for (int i = 0; i < dict.Items.Count; i++)
                         {
                             var item = dict.Items[i];
+                            if (item.DeptId.IsNullOrEmpty())
+                                return ServiceResult.OprateFailed($"第{i + 1}行，部门不可为空");
                             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<Ghrh_YearHumanSettings>().AnyAsync(x => x.Year == item.Year && x.JobId == item.JobId && x.GradeId == item.GradeId && x.JobId == item.GradeId))
+                            if (await Db.Queryable<Ghrh_YearHumanSettings>()
-                                return ServiceResult.OprateFailed($" {item.Year}年度，已存在相同岗位、职等、职称数据！");
+                                .WhereIF(item.GradeId.IsNotEmptyOrNull(), x => x.GradeId == item.GradeId)
+                                .WhereIF(item.JobId.IsNotEmptyOrNull(), x => x.JobId == item.JobId)
+                                .AnyAsync(x => x.Year == item.Year && x.DeptId == item.DeptId && x.TitleId == item.TitleId))
+                                return ServiceResult.OprateFailed($" {item.Year}年度，已存在相同数据！");
                         }
                         #endregion
 

Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs

@@ -1,6 +1,4 @@
-using Tiobon.Core.IServices;
+namespace Tiobon.Core.Services;
-
-namespace Tiobon.Core.Services;
 
 /// <summary>
 /// 录用审批单 (服务)

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -2428,7 +2428,7 @@ END";
             if (entity.Status != DIC_INTERVIEW_ORDER_STATUS.HasInterview || entity.Status != DIC_INTERVIEW_ORDER_STATUS.WaitRecommended)
                 return ServiceResult.OprateFailed("只有在【已面试】、【待推荐】状态下，才能转入待发Offer！");
 
-            if (await Db.Queryable<Ghrh_OfferApplyOrder>().Where(x => x.WorkState == 0 && x.ResumeId == id).AnyAsync())
+            if (await Db.Queryable<Ghrh_OfferApplyOrder>().AnyAsync(x => x.WorkState == 0 && x.ResumeId == id))
                 return ServiceResult.OprateFailed("当前简历录用审批处于审批中，不可转入待发Offer！");
 
             await UpdateResumeStatus(entity, DIC_INTERVIEW_ORDER_STATUS.WaitSendOffer);

Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs

@@ -26,8 +26,11 @@ public class Ghrh_YearHumanSettingsServices : BaseServices<Ghrh_YearHumanSetting
     {
         entity.WorkState = 1;
 
-        if (await Db.Queryable<Ghrh_YearHumanSettings>().AnyAsync(x => x.Year == entity.Year && x.JobId == entity.JobId && x.GradeId == entity.GradeId && x.JobId == entity.GradeId))
+        if (await Db.Queryable<Ghrh_YearHumanSettings>()
-            throw new Exception($" {entity.Year}年度，已存在相同岗位、职等、职称数据！");
+            .WhereIF(entity.GradeId.IsNotEmptyOrNull(), x => x.GradeId == entity.GradeId)
+            .WhereIF(entity.JobId.IsNotEmptyOrNull(), x => x.JobId == entity.JobId)
+            .AnyAsync(x => x.Year == entity.Year && x.DeptId == entity.DeptId && x.TitleId == entity.TitleId))
+            throw new Exception($" {entity.Year}年度，已存在相同数据！");
 
         var result = await base.Add(entity);