From 430e096780219b81e19043829b637fcda4e61ca1 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 20 八月 2025 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 5601642..839920c 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -1,11 +1,11 @@
-锘縰sing System;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
 using Gs.DevApp.Properties;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
+using System;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm.User
 {
@@ -26,7 +26,7 @@
         {
             if (string.IsNullOrEmpty(_userGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勭敤鎴凤紒");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勭敤鎴凤紒");
                 return;
             }
 
@@ -52,15 +52,20 @@
                 strJson = UtilityHelper.HttpPost("", "Role/SetUserRole",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+                if (_rtn.rtnCode > 0)
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
                 Close();
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
-
+        /// <summary>
+        /// 璇诲彇瑙掕壊鍒楄〃
+        /// </summary>
         private void GetCheckList()
         {
             var _obj = new
@@ -74,6 +79,8 @@
                     JsonConvert.SerializeObject(_obj));
                 var dd = UtilityHelper.ReturnToList(strReturn);
                 var dt = dd.rtnData;
+                if (dt == null)
+                    return;
                 ckList.DataSource = dt;
                 ckList.ValueMember = "guid";
                 ckList.DisplayMember = "roleName";
@@ -88,11 +95,15 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
 
+        /// <summary>
+        /// 鏌ョ湅鐢ㄦ埛鐨勬潈闄愰泦鍚�
+        /// </summary>
+        /// <param name="userGuid"></param>
         private void GetTree(string userGuid)
         {
             trv.Nodes.Clear();
@@ -100,7 +111,7 @@
             imageList.Images.Add("icon0", Resources.addfooter_32x32);
             imageList.Images.Add("icon1", Resources.listmultilevel_16x16);
             imageList.Images.Add("icon2", Resources.addcalculatedfield_16x16);
-         //   trv.ImageList = imageList;
+            //   trv.ImageList = imageList;
             var _obj = new
             {
                 userGuid
@@ -113,8 +124,13 @@
                 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 node = new TreeNode(); //瀹氫箟缁撶偣
                     node.Text = (_dy["isCk"].ToString() == "1" ? _gou : "") +
@@ -129,7 +145,7 @@
                         node22.Text =
                             (_dy2["isCk"].ToString() == "1" ? _gou : "") +
                             _dy2["name"]; //涓虹粨鐐硅祴鍊�
-                        node22.Name =  _dy2["guid"].ToString();
+                        node22.Name = _dy2["guid"].ToString();
                         node22.ImageIndex = 1;
                         node22.Checked = _dy2["isCk"].ToString() == "1" ? true : false;
                         var drItem33 = dt.Select("upGuid='" + _dy2["guid"] + "'");
@@ -141,7 +157,7 @@
                                 _dy3["name"]; //涓虹粨鐐硅祴鍊�
                             node33.Name = _dy3["guid"].ToString();
                             node33.ImageIndex = 2;
-                            node33.Checked = _dy3["isCk"].ToString() == "1"? true : false;
+                            node33.Checked = _dy3["isCk"].ToString() == "1" ? true : false;
                             node22.Nodes.Add(node33);
                         }
                         node22.Expand();
@@ -153,7 +169,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
     }

--
Gitblit v1.9.3