From c052583025ff87735d2120dc63aeee7ea5e5524e Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 23 十一月 2022 09:25:11 +0800
Subject: [PATCH] 多项优化

---
 web/web/GwSp.ashx |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/web/GwSp.ashx b/web/web/GwSp.ashx
index feafff4..78adb08 100644
--- a/web/web/GwSp.ashx
+++ b/web/web/GwSp.ashx
@@ -307,17 +307,17 @@
         string string1 = context.GetString("apID");
         string clientId = context.GetString("clientID");
         string string2 = context.GetString("spID");
-        string string3 = context.GetString("opID");
+        string opId = context.GetString("opID");
         int int1 = context.GetInt("routerType");
-        string string4 = context.GetString("clientName");
+        string company = context.GetString("company");
         int int2 = context.GetInt("chargeType");
         int recordCount = 0;
         int int3 = context.GetInt("pageSize", 20);
         int int4 = context.GetInt("pageIndex", 1);
         int int5 = context.GetInt("resendStatus", 1);
         string productId = context.GetString("productId")==null? "": context.GetString("productId");
-        if (!string.IsNullOrEmpty(string3) && int1 <= 0)
-            throw new ArgumentException("璇烽�夋嫨閫氶亾缁勮矾鐢辨ā寮�");
+        if (!string.IsNullOrEmpty(opId) && int1 <= 0)
+        { throw new ArgumentException("璇烽�夋嫨閫氶亾缁勮矾鐢辨ā寮�"); }
         GwSpDao gwSpDao = new GwSpDao();
         string apId = "0";
         if (this.IsInt(string1))
@@ -328,7 +328,7 @@
         string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, null);
 
         //鍔犺浇璐﹀彿鍒楄〃淇℃伅
-        List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, string4, int1, string3, int2, int4, int3, int5.ToString(), productId, permissionsSQL, out recordCount);
+        List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, company, int1, opId, int2, int4, int3, int5.ToString(), productId, permissionsSQL, out recordCount);
         string str1 = "";
         if (list != null && list.Count > 0)
         {
@@ -690,8 +690,8 @@
         cTPattern.Enabled = context.GetInt("enabled");
         cTPattern.Pattern = context.GetString("patternContent");
         string pattern = @"^[A-Za-z0-9]+$"; //鍒ゆ柇鏄瓧绗︽垨鏁板瓧
-        //if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
-        //    throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楋紒");
+                                            //if (!Regex.IsMatch(o.SpID, "^\\d{6}$"))
+                                            //    throw new Exception("璐﹀彿蹇呴』涓�6浣嶆暟瀛楋紒");
         if (!Regex.IsMatch(o.SpID, "^[A-Za-z0-9]{6}$"))
             throw new Exception("璐﹀彿蹇呴』涓�6浣嶅瓧绗︽垨鏁板瓧锛�");
         if (o.AccessCodeMode == 1)
@@ -839,7 +839,7 @@
         this._Dao.Add(o);
         this._Dao.UpdatePattern(string1, @int, string2, context.OperatorID);//娣诲姞璐﹀彿鐨勬椂鍊欓厤缃姤澶�
 
-        
+
         //濡傛灉閫夋嫨浜嗕骇鍝侊紝琛ㄧず鍒涘缓鐨勬椂鍊欏氨婵�娲汇�傚悗鍙板垱寤烘棤璧犻��
         if (!string.IsNullOrEmpty(o.ProductId))
         {

--
Gitblit v1.9.1