From cdca5a70b3fac5f804a6eabb7a3976f8c00e35e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 08 四月 2025 16:40:30 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs |   60 ++++++++++++++++++++----------------------------------------
 1 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 1ca4a51..274fce8 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -93,15 +93,18 @@
         }
 
 
+        /// <summary>
+        /// 鏌ョ湅鐢ㄦ埛鐨勬潈闄愰泦鍚�
+        /// </summary>
+        /// <param name="userGuid"></param>
         private void GetTree(string userGuid)
         {
             trv.Nodes.Clear();
             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;
+            imageList.Images.Add("icon0", Resources.addfooter_32x32);
+            imageList.Images.Add("icon1", Resources.listmultilevel_16x16);
+            imageList.Images.Add("icon2", Resources.addcalculatedfield_16x16);
+         //   trv.ImageList = imageList;
             var _obj = new
             {
                 userGuid
@@ -114,68 +117,45 @@
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
                 var dt = dd.rtnData.list;
                 var drGrp = dt.Select("upGuid='' or upGuid is null");
+
+                // 浣跨敤DefaultView.Sort瀵圭瓫閫夊悗鐨勭粨鏋滆繘琛屾帓搴�
+                DataTable sortedTable = drGrp.CopyToDataTable();
+                sortedTable.DefaultView.Sort = "idx ASC";
+                DataTable result = sortedTable.DefaultView.ToTable();
                 var _gou = "鉁� ";
-                foreach (var _dy in drGrp)
+                foreach (DataRow _dy in result.Rows)
                 {
-                    var _orgGuid = _dy["guid"] + "&";
                     var node = new TreeNode(); //瀹氫箟缁撶偣
                     node.Text = (_dy["isCk"].ToString() == "1" ? _gou : "") +
                                 _dy["name"]; //涓虹粨鐐硅祴鍊�
                     node.Name = _dy["guid"].ToString();
                     node.ImageIndex = 0;
                     node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
-                    var drItem = dt.Select("upGuid='" + _dy["guid"] +
-                                           "' and orgGuid='" + _dy["guid"] +
-                                           "'");
+                    var drItem = dt.Select("upGuid='" + _dy["guid"] + "'");
                     foreach (var _dy2 in drItem)
                     {
                         var node22 = new TreeNode(); //瀹氫箟缁撶偣
                         node22.Text =
                             (_dy2["isCk"].ToString() == "1" ? _gou : "") +
                             _dy2["name"]; //涓虹粨鐐硅祴鍊�
-                        node22.Name = _orgGuid + _dy2["guid"];
+                        node22.Name =  _dy2["guid"].ToString();
                         node22.ImageIndex = 1;
-                        node22.Checked = _dy2["isCk"].ToString() == "1"
-                            ? true
-                            : false;
-                        var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +
-                                                 "' and orgGuid='" +
-                                                 _dy["guid"] + "'");
+                        node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false;
+                        var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "'");
                         foreach (var _dy3 in drItem33)
                         {
                             var node33 = new TreeNode(); //瀹氫箟缁撶偣
                             node33.Text =
                                 (_dy3["isCk"].ToString() == "1" ? _gou : "") +
                                 _dy3["name"]; //涓虹粨鐐硅祴鍊�
-                            node33.Name = _orgGuid + _dy3["guid"];
+                            node33.Name = _dy3["guid"].ToString();
                             node33.ImageIndex = 2;
-                            node33.Checked = _dy3["isCk"].ToString() == "1"
-                                ? true
-                                : false;
-                            var drItem44 = dt.Select("upGuid='" + _dy3["guid"] +
-                                "' and orgGuid='" + _dy["guid"] + "'");
-                            foreach (var _dy4 in drItem44)
-                            {
-                                var node44 = new TreeNode(); //瀹氫箟缁撶偣
-                                node44.Text =
-                                    (_dy4["isCk"].ToString() == "1"
-                                        ? _gou
-                                        : "") + _dy4["name"]; //涓虹粨鐐硅祴鍊�
-                                node44.Name = _orgGuid + _dy4["guid"];
-                                node44.ImageIndex = 3;
-                                node44.Checked = _dy4["isCk"].ToString() == "1"
-                                    ? true
-                                    : false;
-                                node33.Nodes.Add(node44);
-                            }
-
+                            node33.Checked = _dy3["isCk"].ToString() == "1"? true : false;
                             node22.Nodes.Add(node33);
                         }
-
                         node22.Expand();
                         node.Nodes.Add(node22);
                     }
-
                     node.Expand();
                     trv.Nodes.Add(node);
                 }

--
Gitblit v1.9.3