From e3b7fd23fa49bc0329e43d274d9a3e0563e4420d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 30 五月 2025 13:57:19 +0800
Subject: [PATCH] 缺陷描述
---
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 76 +++++++++++++++-----------------------
1 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 1ca4a51..92979ef 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
{
@@ -60,7 +60,9 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瑙掕壊鍒楄〃
+ /// </summary>
private void GetCheckList()
{
var _obj = new
@@ -74,6 +76,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";
@@ -93,15 +97,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 +121,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