优化

Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs

@@ -3822,7 +3822,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
 
                 var currencyId = await Db.Ado.GetIntAsync("SELECT top 1 CurrencyID FROM Ghrc_Currency where CurrencyNo='RMB'");
                 if (data.S02.IsNotEmptyOrNull())
-                    if (data.S02 > 0)
+                    if (data.S02 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S02").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3837,7 +3837,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                     }
 
                 if (data.S03.IsNotEmptyOrNull())
-                    if (data.S03 > 0)
+                    if (data.S03 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S03").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3851,7 +3851,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S04.IsNotEmptyOrNull())
-                    if (data.S04 > 0)
+                    if (data.S04 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S04").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3879,7 +3879,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S06.IsNotEmptyOrNull())
-                    if (data.S06 > 0)
+                    if (data.S06 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S06").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3893,7 +3893,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S21.IsNotEmptyOrNull())
-                    if (data.S21 > 0)
+                    if (data.S21 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S21").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3907,7 +3907,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S22.IsNotEmptyOrNull())
-                    if (data.S22 > 0)
+                    if (data.S22 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S22").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3921,7 +3921,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S23.IsNotEmptyOrNull())
-                    if (data.S23 > 0)
+                    if (data.S23 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S23").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3935,7 +3935,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S66.IsNotEmptyOrNull())
-                    if (data.S66 > 0)
+                    if (data.S66 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S66").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3949,7 +3949,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S68.IsNotEmptyOrNull())
-                    if (data.S68 > 0)
+                    if (data.S68 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S68").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -3963,7 +3963,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                         });
                     }
                 if (data.S70.IsNotEmptyOrNull())
-                    if (data.S70 > 0)
+                    if (data.S70 != 0)
                     {
                         var salaryItemId = (await Db.Queryable<Ghrc_SalaryItem>().Where(x => x.SalaryItemNo == "S70").FirstAsync())?.SalaryItemID;
                         items.Add(new Ghrh_OfferApplyOrderSalary()
@@ -4757,7 +4757,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
 
     #endregion
 
-    #region 录用名单
+    #region 录用名单导出
 
     public async Task<ServiceResult<ExcelData>> ExportHireExcel(QueryExport body)
     {
@@ -5226,7 +5226,8 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1
                 #endregion
 
                 #region 薪资项目同步
-                if (inTime != null)
+                if (applyOrder != null && inTime != null && applyOrder.ProbationSalary != null)
+                    if (applyOrder.ProbationSalary > 0)
                     {
                         var salaryConfig = await Db.Queryable<Ghrh_Config>().Where(x => x.ConfigCode == "ESS_Recruit_Custom_Check_In_Apply_Salary").FirstAsync();
                         var TempOrOfficial = salaryConfig?.ConfigValue ?? "Temp";