From 088ffc818b13bf7bca56eb2f7f323d833fce382c Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 20 六月 2022 21:28:52 +0800
Subject: [PATCH] 首页:通道状态

---
 web/Dao/GwClientDao.cs |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/web/Dao/GwClientDao.cs b/web/Dao/GwClientDao.cs
index c1d1699..a8de674 100644
--- a/web/Dao/GwClientDao.cs
+++ b/web/Dao/GwClientDao.cs
@@ -596,8 +596,8 @@
 
                 list = new List<KeyValuePair<string, OracleParameter[]>>();
                 list.Add(new KeyValuePair<string, OracleParameter[]>(key2, oracleParameterArray2));
-                OracleHelper.ExecuteSqlTran(list, OracleHelper.Connection);
             }
+            OracleHelper.ExecuteSqlTran(list, OracleHelper.Connection);
 
 
             //鏇存柊涓�у垎閰嶅鎴烽泦闀垮害涓�0鏃�
@@ -612,18 +612,18 @@
 
                 list = new List<KeyValuePair<string, OracleParameter[]>>();
                 list.Add(new KeyValuePair<string, OracleParameter[]>(key3, oracleParameterArray2));
-                OracleHelper.ExecuteSqlTran(list, OracleHelper.Connection);
             }
+            OracleHelper.ExecuteSqlTran(list, OracleHelper.Connection);
         }
 
 
         /**
          * 鍑芥暟鎻忚堪锛� 鏍规嵁绯荤粺鐢ㄦ埛鑾峰彇鏈夋潈闄愬鎴�
          * userId: 鐢ㄦ埛ID
-         * userType: 鐢ㄦ埛绫诲瀷锛�1-绠$悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-涓氬姟涓荤;4-涓氬姟鎬荤洃;5-瀹㈡湇浜哄憳;6-璐㈠姟浜哄憳;99-鍏朵粬
+         * userType: 鐢ㄦ埛绫诲瀷锛屽涓椂浠モ��,鈥濆垎闅旓細1-绠$悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-瀹㈡埛缁忕悊;4-瀹㈡湇浜哄憳;5-璐㈠姟浜哄憳
          * return: SQL瀛楃涓�
          * */
-        public string GetClientPermissions(int userId, int userType, string alias)
+        public string GetClientPermissions(int userId, string userType, string alias)
         {
             if (!string.IsNullOrEmpty(alias))
             {
@@ -631,17 +631,18 @@
             }
 
             string sqlStr = "";
-            //涓氬姟鍛樺拰鍏朵粬
-            if(userType==2 || userType == 99)
+            //涓氬姟鍛�
+            if(DataConverter.checkStrForArrayStr(2, userType))
             {
                 sqlStr  += " AND " + alias + "CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE IS_ENABLE=1 AND (SALESMAN='" + userId + "' ) ) ";
             }
-            //涓氬姟涓荤
-            else if (userType == 3)
+            //瀹㈡埛缁忕悊
+            else if (DataConverter.checkStrForArrayStr(3, userType) )
             {
                 sqlStr += " AND " + alias + "CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE IS_ENABLE=1 AND (SALESMAN='" + userId + "' or CUSTOMER_MANAGER='" + userId + "' ) ) ";
             }
-            else
+            //绠$悊鍛�
+            else if (DataConverter.checkStrForArrayStr(1, userType))
             {
                 //sqlStr += " AND CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE IS_ENABLE=1 ) ";
             }
@@ -652,10 +653,10 @@
         /**
          * 鍑芥暟鎻忚堪锛� 鏍规嵁绯荤粺鐢ㄦ埛鑾峰彇鏈夋潈闄愬鎴疯处鍙�
          * userId: 鐢ㄦ埛ID
-         * userType: 鐢ㄦ埛绫诲瀷锛�1-绠$悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-涓氬姟涓荤;4-涓氬姟鎬荤洃;5-瀹㈡湇浜哄憳;6-璐㈠姟浜哄憳;99-鍏朵粬
+         * userType: 鐢ㄦ埛绫诲瀷锛屽涓椂浠モ��,鈥濆垎闅旓細1-绠$悊鍛�;2-涓氬姟鍛�--鍏ㄥ憳;3-瀹㈡埛缁忕悊;4-瀹㈡湇浜哄憳;5-璐㈠姟浜哄憳
          * return: SQL瀛楃涓�
          * */
-        public string GetSpPermissions(int userId, int userType, string alias)
+        public string GetSpPermissions(int userId, string userType, string alias)
         {
             if (!string.IsNullOrEmpty(alias))
             {
@@ -663,17 +664,18 @@
             }
 
             string sqlStr = "";
-            //涓氬姟鍛樺拰鍏朵粬
-            if (userType == 2 || userType == 99)
+            //涓氬姟鍛�
+            if (DataConverter.checkStrForArrayStr(2, userType))
             {
                 sqlStr += " AND " + alias + "SP_ID IN (SELECT SP_ID from GW_SP where DEL_FLAG = 0 and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE IS_ENABLE=1 AND (SALESMAN='" + userId + "' ) ) ) ";
             }
-            //涓氬姟涓荤
-            else if (userType == 3)
+            //瀹㈡埛缁忕悊
+            else if (DataConverter.checkStrForArrayStr(3, userType))
             {
                 sqlStr += " AND " + alias + "SP_ID IN (SELECT SP_ID from GW_SP where DEL_FLAG = 0 and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE IS_ENABLE=1 AND (SALESMAN='" + userId + "' or CUSTOMER_MANAGER='" + userId + "' ) ) ) ";
             }
-            else
+            //绠$悊鍛�
+            else if (DataConverter.checkStrForArrayStr(1, userType))
             {
                 //sqlStr += " AND CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE IS_ENABLE=1 ) ";
             }

--
Gitblit v1.9.1