Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

7 天以前 80a908596cb1d1faac6b0f54f68182ad22303814

 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");
                }