浏览代码

🤝!547 调度任务查询引发Oracle数据库'ORA-00972:标识符过长'的错误
Merge pull request !547 from OneNewPerson/next

zuohuaijun 3 年之前
父节点
当前提交
f98b248a14

+ 14 - 1
Admin.NET/Admin.NET.Core/Service/Job/SysJobService.cs

@@ -32,7 +32,20 @@ public class SysJobService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.Description), u => u.Description.Contains(input.Description))
             .Select(d => new JobOutput
             {
-                JobDetail = d,
+                JobDetail = new SysJobDetail
+                {
+                    AssemblyName = d.AssemblyName,
+                    Concurrent = d.Concurrent,
+                    Description = d.Description,
+                    GroupName = d.GroupName,
+                    Id = d.Id,
+                    IncludeAnnotations = d.IncludeAnnotations,
+                    JobId = d.JobId,
+                    JobType = d.JobType,
+                    Properties = d.Properties,
+                    ScriptCode = d.ScriptCode,
+                    UpdatedTime = d.UpdatedTime
+                }
             }).ToPagedListAsync(input.Page, input.PageSize);
         await _sysJobDetailRep.AsSugarClient().ThenMapperAsync(jobDetails.Items, async u =>
         {

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -58,6 +58,7 @@ public class SysTenantService : IDynamicApiController, ITransient
             .LeftJoin<SysOrg>((t, u, o) => t.OrgId == o.Id)
             .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), (t, u) => u.Phone.Contains(input.Phone.Trim()))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name), (t, u, o) => o.Name.Contains(input.Name.Trim()))
+            .OrderBy(t => t.OrderNo)
             .Select((t, u, o) => new TenantOutput
             {
                 Id = t.Id,