From aa3ebb987532d0d8c866e9a6756099476f4a9fec Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Tue, 31 Dec 2024 16:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E5=8F=AF=E8=A7=81=E7=9A=84=E6=95=B0=E6=8D=AE=E8=A6=81?= =?UTF-8?q?=E8=B7=9F=E7=9D=80=E4=BA=BA=E5=91=98=E6=9D=83=E9=99=90=E8=B5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs | 2 +- Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs | 2 +- Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs | 2 +- Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs index bb743bbb..873a3e6a 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_HumanRequestServices.cs @@ -97,7 +97,7 @@ public class Ghrh_HumanRequestServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { - var result = await base.QueryFilterPage(filter, condition, IsEnable); + var result = await base.QueryFilterPage(filter, $"dbo.[FUserDeptPriv] ({App.User.ID}, DeptId, getdate())=1", IsEnable); var entitys = result.result.DT_TableDataT1; var deptIds = entitys.Where(x => x.DeptId != null).Select(x => x.DeptId).ToList(); diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs index 5002ea0f..b16f24a2 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_OfferApplyOrderServices.cs @@ -33,7 +33,7 @@ public class Ghrh_OfferApplyOrderServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { - var result = await base.QueryFilterPage(filter, condition, IsEnable); + var result = await base.QueryFilterPage(filter, $"dbo.[FUserDeptPriv] ({App.User.ID}, DeptId, getdate())=1", IsEnable); var entitys = result.result.DT_TableDataT1; var deptIds = entitys.Where(x => x.DeptId != null).Select(x => x.DeptId).ToList(); diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs index 9444f4ac..e933d7e6 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeServices.cs @@ -4245,7 +4245,7 @@ WHERE A.IsEnable = 1 AND C.IsEnable = 1 { var group = await Db.Queryable() - .Where(x => x.StaffId == GetStaffId()).GroupBy(x => x.Status) + .Where(x => x.StaffId == App.User.StaffId).GroupBy(x => x.Status) .Select(g => new { g.Status, diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs index c0a36d2e..03d3a1e0 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_YearHumanSettingsServices.cs @@ -62,7 +62,7 @@ public class Ghrh_YearHumanSettingsServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) { - var result = await base.QueryFilterPage(filter, "WorkState = 1", IsEnable); + var result = await base.QueryFilterPage(filter, $"WorkState = 1 AND dbo.[FUserDeptPriv] ({App.User.ID}, DeptId, getdate())=1", IsEnable); var entitys = result.result.DT_TableDataT1; int? year = null; if (filter.jsonParam != null)