From c8b6903d85e7ceef504a198b4bdfc6b72a73fe19 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 13:29:47 +0800
Subject: [PATCH] fix:bug
---
FlexJobApi.Core/Utils/DbUtils/DbUtils.cs | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs b/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs
index 46a2dc2..b770ec5 100644
--- a/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs
+++ b/FlexJobApi.Core/Utils/DbUtils/DbUtils.cs
@@ -148,7 +148,7 @@
var q = rep.AsQueryable().AsNoTracking();
if (query != null) q = query(q);
else q = q.OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime);
- q = q.OrderBy(page.OrderInput);
+ q = q.CustomOrderBy(page.OrderInput);
var s = selector == null
? q.ProjectToType<TItem>()
: q.Select(selector);
@@ -175,7 +175,7 @@
CancellationToken cancellationToken = default)
where TItem : class, new()
{
- q = q.OrderBy(page.OrderInput);
+ //q = q.CustomOrderBy(page.OrderInput);
var pagedList = await q.ToPagedListAsync(page.Page, page.Rows, cancellationToken);
var result = new PagedListQueryResult<TItem>();
result.PageModel = page.Adapt<PagedListQueryResultPageModel>();
@@ -192,7 +192,7 @@
/// <param name="q"></param>
/// <param name="orders"></param>
/// <returns></returns>
- public static IQueryable<T> OrderBy<T>(
+ public static IQueryable<T> CustomOrderBy<T>(
this IQueryable<T> q,
List<PagedListQueryPageModelOrderInput> orders)
{
@@ -455,10 +455,17 @@
}
// 璧嬪�肩敤鎴蜂俊鎭疘d
- prop = entity.Property(nameof(CommonEntity.CreatedUserInfoId));
+ prop = entity.Property(nameof(CommonEntity.CreatedUserId));
if (prop != null && prop.CurrentValue == null)
{
- prop.CurrentValue = logier?.UserInfoId;
+ prop.CurrentValue = logier?.Id;
+ }
+
+ // 璧嬪�间紒涓欼d
+ prop = entity.Property(nameof(CommonEntity.CreatedEnterpriseId));
+ if (prop != null && prop.CurrentValue == null)
+ {
+ prop.CurrentValue = logier?.EnterpriseId;
}
// 璧嬪�艰窡韪狪d
@@ -478,10 +485,10 @@
}
// 璧嬪�肩敤鎴蜂俊鎭疘d
- prop = entity.Property(nameof(CommonEntity.UpdatedUserInfoId));
+ prop = entity.Property(nameof(CommonEntity.UpdatedUserId));
if (prop != null)
{
- prop.CurrentValue = logier?.UserInfoId;
+ prop.CurrentValue = logier?.Id;
}
// 璧嬪�艰窡韪狪d
@@ -527,7 +534,8 @@
: EnumDbAuditOperate.Deleted,
TraceId = App.GetTraceId(),
CreatedTime = DateTime.Now,
- CreatedUserInfoId = logier?.UserInfoId,
+ CreatedUserId = logier?.Id,
+ CreatedEnterpriseId = logier?.EnterpriseId
});
}
}
--
Gitblit v1.9.1