From 4b7075beba3ac2f75bd295fb1c413cd514ce1a4c Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 11 六月 2024 23:41:22 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/BLL/Xt_SystemLogController.cs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/BLL/Xt_SystemLogController.cs b/WebAPI/Controllers/BLL/Xt_SystemLogController.cs index 5952fa1..7daf7eb 100644 --- a/WebAPI/Controllers/BLL/Xt_SystemLogController.cs +++ b/WebAPI/Controllers/BLL/Xt_SystemLogController.cs @@ -33,11 +33,12 @@ List<object> columnNameList = new List<object>(); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Xt_SystemLogList " + sWhere + " order by hid desc", "h_v_Xt_SystemLogList"); + string sql = "select top(1000)* from h_v_Xt_SystemLogList " + sWhere + " order by hid desc"; + ds = oCN.RunProcReturn(sql, "h_v_Xt_SystemLogList"); } else { - string sql1 = "select * from h_v_Xt_SystemLogList where 1 = 1 "; + string sql1 = "select top(1000)* from h_v_Xt_SystemLogList where 1 = 1 "; string sql = sql1 + sWhere + " order by hid desc"; ds = oCN.RunProcReturn(sql, "h_v_Xt_SystemLogList"); } -- Gitblit v1.9.1