From d54ebf3cba297b8f7541af9462cc1463bae7ee7a Mon Sep 17 00:00:00 2001
From: zhoukeda <1315948824@qq.com>
Date: Fri, 27 Oct 2023 15:41:22 +0800
Subject: [PATCH] bug

---
 EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs    | 9 +++++++--
 EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs | 7 +++++--
 EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs  | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
index 1e4be533..aecbaf0e 100644
--- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
@@ -321,9 +321,13 @@ namespace Tnb.EquipMgr
             
             if (string.IsNullOrEmpty(input.sidx))
             {
-                input.sidx = "create_time";
+                input.sidx = "a.create_time";
                 input.sort = "desc";
             }
+            else
+            {
+                input.sidx = "a." + input.sidx;
+            }
             
             var db = _repository.AsSugarClient();
             var result = await db.Queryable<EqpRepairApply>()
@@ -355,7 +359,8 @@ namespace Tnb.EquipMgr
                     repairer_id_id = c.Id,
                     remark = a.remark,
                     status = f.FullName
-                }).ToListAsync();
+                })
+                .ToListAsync();
             
             return result;
         }
diff --git a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
index 693c41da..9c21e062 100644
--- a/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
@@ -61,8 +61,11 @@ namespace Tnb.EquipMgr
             
             if (string.IsNullOrEmpty(input.sidx))
             {
-                input.sidx = "create_time";
+                input.sidx = "a.create_time";
                 input.sort = "desc";
+            }else
+            {
+                input.sidx = "a." + input.sidx;
             }
             
             var list = await db.Queryable<EqpMaintainRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[]
@@ -75,6 +78,7 @@ namespace Tnb.EquipMgr
                 .WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo))
                 .WhereIF(status=="3" && start_time!=null,a=>a.execute_time>=start_time)
                 .WhereIF(status=="3" && end_time!=null,a=>a.execute_time<=end_time)
+                .OrderBy($"{input.sidx} {input.sort}")
                 .Select((a, b, c,d) => new EqpMaintainRecordListOutput
                 {
                     id = a.id,
@@ -94,7 +98,6 @@ namespace Tnb.EquipMgr
                     repeat_remark = a.repeat_remark,
                     date_last_execute_time = SqlFunc.Subqueryable<EqpMaintainRecordH>().Where(x=>a.equip_id==x.equip_id && a.execute_time!=null).OrderByDesc(x=>x.execute_time).Select(x=>x.execute_time)
                 })
-                .OrderBy($"{input.sidx} {input.sort}")
                 .Mapper(a =>
                 {
                     a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成";
diff --git a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
index 6fc466c8..39eb0c0f 100644
--- a/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
+++ b/EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
@@ -62,9 +62,13 @@ namespace Tnb.EquipMgr
             
             if (string.IsNullOrEmpty(input.sidx))
             {
-                input.sidx = "create_time";
+                input.sidx = "a.create_time";
                 input.sort = "desc";
             }
+            else
+            {
+                input.sidx = "a." + input.sidx;
+            }
             
             var list = await db.Queryable<EqpSpotInsRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[]
                 {
@@ -76,6 +80,7 @@ namespace Tnb.EquipMgr
                 .WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo))
                 .WhereIF(status=="3" && start_time!=null,a=>a.spot_record_date_time>=start_time)
                 .WhereIF(status=="3" && end_time!=null,a=>a.spot_record_date_time<=end_time)
+                .OrderBy($"{input.sidx} {input.sort}")
                 .Select((a, b, c,d) => new EqpSpotInsRecordListOutput
                 {
                     id = a.id,
@@ -92,7 +97,6 @@ namespace Tnb.EquipMgr
                     repeat_user_id = d.RealName,
                     repeat_user_id_id = a.repeat_user_id,
                 })
-                .OrderBy($"{input.sidx} {input.sort}")
                 .Mapper(a =>
                 {
                     a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成";