From cefcc903f51610846fa313a3a35bca34e129c1fe Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 十月 2024 08:57:01 +0800
Subject: [PATCH] 代码清理以及格式化

---
 DevApp/Gs.DevApp/DevFrm/User/Role.cs |  311 +++++++++++++++++++++++++++++----------------------
 1 files changed, 179 insertions(+), 132 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index b663200..2ff7957 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -1,30 +1,34 @@
-锘縰sing DevExpress.XtraGrid.Views.Base;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
+锘縰sing System;
 using System.Collections.Generic;
-using System.Data;
 using System.Drawing;
+using System.Text;
 using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Base;
+using Gs.DevApp.Entity;
+using Gs.DevApp.Properties;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
 
 namespace Gs.DevApp.DevFrm.User
 {
-    public partial class Role : DevExpress.XtraEditors.XtraForm
+    public partial class Role : XtraForm
     {
-        System.Text.StringBuilder _actionLst = new System.Text.StringBuilder();
-        List<FilterEntity> _filterList = new List<FilterEntity>();
+        private StringBuilder _actionLst = new StringBuilder();
+        private List<FilterEntity> _filterList = new List<FilterEntity>();
+
         public Role()
         {
             InitializeComponent();
-            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
-            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
-            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            this.toolBarMenu1.btnRoleClick += ToolBarMenu1_btnRoleClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            toolBarMenu1.btnRoleClick += ToolBarMenu1_btnRoleClick;
+            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
             gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
             getPageList(1, UtilityHelper.GetPageSize());
@@ -34,46 +38,49 @@
             gridView1.CustomDrawRowIndicator += (s, e) =>
             {
                 if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                {
                     e.Info.DisplayText = (e.RowHandle + 1).ToString();
-                }
             };
             gridView1.CustomDrawEmptyForeground += (s, e) =>
             {
-                string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                Font f = new Font("寰蒋闆呴粦", 16);
-                Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
+                var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
+                var f = new Font("寰蒋闆呴粦", 16);
+                var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
+                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
                 e.Graphics.DrawString(str, f, Brushes.Gray, r);
             };
         }
+
         /// <summary>
-        /// 鎹㈠垏鎹簨浠�
+        ///     鎹㈠垏鎹簨浠�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void GridView1_FocusedRowChanged(object sender, FocusedRowChangedEventArgs e)
+        private void GridView1_FocusedRowChanged(object sender,
+            FocusedRowChangedEventArgs e)
         {
-            string rowGuid = "";
-            DataRow myDataRow = gridView1.GetDataRow(e.FocusedRowHandle);
+            var rowGuid = "";
+            var myDataRow = gridView1.GetDataRow(e.FocusedRowHandle);
             if (myDataRow == null) return;
             rowGuid = myDataRow["guid"].ToString();
             getTree(rowGuid);
-            groupBox1.Text = "璇峰嬀閫夈��" + myDataRow["roleName"].ToString() + "銆戠殑鏉冮檺";
+            groupBox1.Text = "璇峰嬀閫夈��" + myDataRow["roleName"] + "銆戠殑鏉冮檺";
         }
+
         /// <summary>
-        /// 鍙屽嚮浜嬩欢
+        ///     鍙屽嚮浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
         {
-            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
+            var rowGuid =
+                UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
             if (!string.IsNullOrEmpty(rowGuid))
                 getModel(rowGuid, false, 999);
-
         }
+
         /// <summary>
-        /// 鍒嗛〉浜嬩欢
+        ///     鍒嗛〉浜嬩欢
         /// </summary>
         /// <param name="curPage"></param>
         /// <param name="pageSize"></param>
@@ -81,19 +88,21 @@
         {
             getPageList(curPage, pageSize);
         }
+
         /// <summary>
-        /// 鏌ヨ浜嬩欢
+        ///     鏌ヨ浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
         {
-            Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+            var frm = new ShowFilter(gridView1.Columns, _filterList);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
+
         /// <summary>
-        /// 鏌ヨ鍥炶皟
+        ///     鏌ヨ鍥炶皟
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -104,7 +113,7 @@
         }
 
         /// <summary>
-        /// 鍙栨秷浜嬩欢
+        ///     鍙栨秷浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -112,43 +121,50 @@
         {
             UtilityHelper.JumpToTab(xtraTabControl1, 0);
         }
+
         /// <summary>
-        /// 鍒犻櫎浜嬩欢
+        ///     鍒犻櫎浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
         {
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1, 2);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_roleName, gridView1, 2);
             if (string.IsNullOrEmpty(rowGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
+
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName +
+                                       "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
                 return;
-            List<string> lst = new List<string>();
+            var lst = new List<string>();
             lst.Add(rowGuid);
             var _obj = lst;
             try
             {
-                string strJson = UtilityHelper.HttpPost("", "Role/DeleteModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                var strJson = UtilityHelper.HttpPost("", "Role/DeleteModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
                     UtilityHelper.JumpToTab(xtraTabControl1, 0);
                     getPageList(1, UtilityHelper.GetPageSize());
                 }
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
         /// <summary>
-        /// 鍒锋柊浜嬩欢
+        ///     鍒锋柊浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -157,24 +173,28 @@
             UtilityHelper.JumpToTab(xtraTabControl1, 0);
             getPageList(1, UtilityHelper.GetPageSize());
         }
+
         /// <summary>
-        /// 淇敼浜嬩欢
+        ///     淇敼浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
         {
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_roleName, gridView1);
             if (string.IsNullOrEmpty(rowGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
+
             getModel(rowGuid, true, 1);
         }
+
         /// <summary>
-        /// 鏂板浜嬩欢
+        ///     鏂板浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -182,10 +202,11 @@
         {
             UtilityHelper.JumpToTab(xtraTabControl1, 1);
             lbGuid.Text = "";
-            UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
+            UtilityHelper.CleanValueByControl(panel1.Controls, true);
         }
+
         /// <summary>
-        /// 淇濆瓨浜嬩欢
+        ///     淇濆瓨浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -194,209 +215,237 @@
             toolBarMenu1.isSetBtn = false;
             if (string.IsNullOrEmpty(txt_roleName.Text.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�");
+                MsgHelper.Warning("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�");
                 txt_roleName.Focus();
                 return;
             }
+
             if (string.IsNullOrEmpty(txt_roleRemark.Text.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�");
+                MsgHelper.Warning("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�");
                 txt_roleRemark.Focus();
                 return;
             }
+
             var _obj = new
             {
                 guid = lbGuid.Text.Trim(),
                 roleName = txt_roleName.Text.Trim(),
                 roleRemark = txt_roleRemark.Text.Trim(),
-                isStatus = txt_isStatus.Checked,//鐘舵��
+                isStatus = txt_isStatus.Checked //鐘舵��
             };
             try
             {
-                string strJson = UtilityHelper.HttpPost("", "Role/EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                var strJson = UtilityHelper.HttpPost("", "Role/EditModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
-
+                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
                 }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
 
         /// <summary>
-        /// 鏉冮檺璁剧疆浜嬩欢
+        ///     鏉冮檺璁剧疆浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ToolBarMenu1_btnRoleClick(object sender, EventArgs e)
         {
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_roleName, gridView1);
             if (string.IsNullOrEmpty(rowGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
+
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾璁剧疆鏉冮檺鍚楋紵"))
                 return;
-            _actionLst = new System.Text.StringBuilder();
+            _actionLst = new StringBuilder();
             TraverseTreeViewNodes(trv.Nodes);
             var _obj = new
             {
                 roleGuid = rowGuid,
-                actionLst = _actionLst.ToString(),
+                actionLst = _actionLst.ToString()
             };
             try
             {
-                string strJson = UtilityHelper.HttpPost("", "Role/SetRoleMenuAction", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+                var strJson = UtilityHelper.HttpPost("",
+                    "Role/SetRoleMenuAction",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
 
         /// <summary>
-        /// 
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage, int pageSize)
         {
-            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
-            foreach (FilterEntity itm in _filterList)
-            {
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
-            }
-            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "CREATE_TIME", "desc", "", _sbSqlWhere.ToString());
-            string json = JsonConvert.SerializeObject(pgq);
+            var _sbSqlWhere = new StringBuilder();
+            foreach (var itm in _filterList)
+                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
+                                   itm.fileValue + "'");
+            var pgq = new PageQueryModel(curPage, pageSize, "CREATE_TIME",
+                "desc", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
             try
             {
-                string strReturn = UtilityHelper.HttpPost("", "Role/GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                DataTable dt = dd.rtnData.list;
+                var strReturn =
+                    UtilityHelper.HttpPost("", "Role/GetListPage", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = dd.rtnData.list;
                 gcMain.BindingContext = new BindingContext();
                 gcMain.DataSource = dt;
                 gcMain.ForceInitialize();
-                int dddd = dd.rtnData.pages;//鎬婚〉
+                var dddd = dd.rtnData.pages; //鎬婚〉
                 pageBar1.TotalPages = dddd;
-                pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
-                pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
+                pageBar1.CurrentPage = curPage; //褰撳墠椤�
+                pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
                 pageBar1.setTxt();
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
         private void getModel(string strGuid, bool isEdit, int tabIdx)
         {
             if (string.IsNullOrEmpty(strGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
+
             UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
             var _obj = new
             {
-                guid = strGuid,//涓诲缓
+                guid = strGuid //涓诲缓
             };
-            string strJson = "";
+            var strJson = "";
             try
             {
-                strJson = UtilityHelper.HttpPost("", "Role/GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                strJson = UtilityHelper.HttpPost("", "Role/GetModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
-                    dynamic dy = _rtn.rtnData;
+                    var dy = _rtn.rtnData;
                     lbGuid.Text = strGuid;
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
+                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
                 }
                 else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
         private void getTree(string roleGuid)
         {
             trv.Nodes.Clear();
-            ImageList imageList = new ImageList();
-            imageList.Images.Add("icon0", Properties.Resources.publicfix_32x32);
-            imageList.Images.Add("icon1", Properties.Resources.addfooter_32x32);
-            imageList.Images.Add("icon2", Properties.Resources.listmultilevel_16x16);
-            imageList.Images.Add("icon3", Properties.Resources.addcalculatedfield_16x16);
+            var imageList = new ImageList();
+            imageList.Images.Add("icon0", Resources.publicfix_32x32);
+            imageList.Images.Add("icon1", Resources.addfooter_32x32);
+            imageList.Images.Add("icon2", Resources.listmultilevel_16x16);
+            imageList.Images.Add("icon3", Resources.addcalculatedfield_16x16);
             trv.ImageList = imageList;
             var _obj = new
             {
-                roleGuid = roleGuid,//涓诲缓
+                roleGuid //涓诲缓
             };
             try
             {
-                string strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole", JsonConvert.SerializeObject(_obj));
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                DataTable dt = dd.rtnData.list;
-                DataRow[] drGrp = dt.Select("upGuid='' or upGuid is null");
-                foreach (DataRow _dy in drGrp)
+                var strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole",
+                    JsonConvert.SerializeObject(_obj));
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = dd.rtnData.list;
+                var drGrp = dt.Select("upGuid='' or upGuid is null");
+                foreach (var _dy in drGrp)
                 {
-                    string _orgGuid = _dy["guid"].ToString() + "&";
-                    TreeNode node = new TreeNode();//瀹氫箟缁撶偣
-                    node.Text = _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
+                    var _orgGuid = _dy["guid"] + "&";
+                    var node = new TreeNode(); //瀹氫箟缁撶偣
+                    node.Text = _dy["name"].ToString(); //涓虹粨鐐硅祴鍊�
                     node.Name = _dy["guid"].ToString();
                     node.ImageIndex = 0;
-                    node.Checked = (_dy["isCk"].ToString() == "1" ? true : false);
-                    DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "' and orgGuid='" + _dy["guid"].ToString() + "'");
-                    foreach (DataRow _dy2 in drItem)
+                    node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
+                    var drItem = dt.Select("upGuid='" + _dy["guid"] +
+                                           "' and orgGuid='" + _dy["guid"] +
+                                           "'");
+                    foreach (var _dy2 in drItem)
                     {
-                        TreeNode node22 = new TreeNode();//瀹氫箟缁撶偣
-                        node22.Text = _dy2["name"].ToString();//涓虹粨鐐硅祴鍊�
-                        node22.Name = _orgGuid + _dy2["guid"].ToString();
+                        var node22 = new TreeNode(); //瀹氫箟缁撶偣
+                        node22.Text = _dy2["name"].ToString(); //涓虹粨鐐硅祴鍊�
+                        node22.Name = _orgGuid + _dy2["guid"];
                         node22.ImageIndex = 1;
-                        node22.Checked = (_dy2["isCk"].ToString() == "1" ? true : false);
-                        DataRow[] drItem33 = dt.Select("upGuid='" + _dy2["guid"].ToString() + "' and orgGuid='" + _dy["guid"].ToString() + "'");
-                        foreach (DataRow _dy3 in drItem33)
+                        node22.Checked = _dy2["isCk"].ToString() == "1"
+                            ? true
+                            : false;
+                        var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +
+                                                 "' and orgGuid='" +
+                                                 _dy["guid"] + "'");
+                        foreach (var _dy3 in drItem33)
                         {
-                            TreeNode node33 = new TreeNode();//瀹氫箟缁撶偣
-                            node33.Text = _dy3["name"].ToString();//涓虹粨鐐硅祴鍊�
-                            node33.Name = _orgGuid + _dy3["guid"].ToString();
+                            var node33 = new TreeNode(); //瀹氫箟缁撶偣
+                            node33.Text = _dy3["name"].ToString(); //涓虹粨鐐硅祴鍊�
+                            node33.Name = _orgGuid + _dy3["guid"];
                             node33.ImageIndex = 2;
-                            node33.Checked = (_dy3["isCk"].ToString() == "1" ? true : false);
-                            DataRow[] drItem44 = dt.Select("upGuid='" + _dy3["guid"].ToString() + "' and orgGuid='" + _dy["guid"].ToString() + "'");
-                            foreach (DataRow _dy4 in drItem44)
+                            node33.Checked = _dy3["isCk"].ToString() == "1"
+                                ? true
+                                : false;
+                            var drItem44 = dt.Select("upGuid='" + _dy3["guid"] +
+                                "' and orgGuid='" + _dy["guid"] + "'");
+                            foreach (var _dy4 in drItem44)
                             {
-                                TreeNode node44 = new TreeNode();//瀹氫箟缁撶偣
-                                node44.Text = _dy4["name"].ToString();//涓虹粨鐐硅祴鍊�
-                                node44.Name = _orgGuid + _dy4["guid"].ToString();
+                                var node44 = new TreeNode(); //瀹氫箟缁撶偣
+                                node44.Text = _dy4["name"].ToString(); //涓虹粨鐐硅祴鍊�
+                                node44.Name = _orgGuid + _dy4["guid"];
                                 node44.ImageIndex = 3;
-                                node44.Checked = (_dy4["isCk"].ToString() == "1" ? true : false);
+                                node44.Checked = _dy4["isCk"].ToString() == "1"
+                                    ? true
+                                    : false;
                                 node33.Nodes.Add(node44);
                             }
+
                             node22.Nodes.Add(node33);
                         }
+
                         node22.Expand();
                         node.Nodes.Add(node22);
                     }
+
                     node.Expand();
                     trv.Nodes.Add(node);
                 }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
         private void Trv_AfterCheck(object sender, TreeViewEventArgs e)
         {
             try
@@ -410,6 +459,7 @@
                 MsgHelper.ShowError(ex.Message);
             }
         }
+
         // 閬嶅巻TreeView涓殑鎵�鏈夎妭鐐�
         private void TraverseTreeViewNodes(TreeNodeCollection nodes)
         {
@@ -418,10 +468,7 @@
                 if (node.Checked)
                     _actionLst.Append(node.Name + "~");
                 // 閫掑綊閬嶅巻瀛愯妭鐐�
-                if (node.Nodes.Count > 0)
-                {
-                    TraverseTreeViewNodes(node.Nodes);
-                }
+                if (node.Nodes.Count > 0) TraverseTreeViewNodes(node.Nodes);
             }
         }
     }

--
Gitblit v1.9.3