From bd06bb837fa0c7edeeae56cb0fe4fb844f53fb2f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:34 +0800
Subject: [PATCH] 修改了报表设计器
---
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index e638298..1ec99af 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -50,8 +50,8 @@
string strJson = "";
try
{
- strJson = UtilityHelper.HttpPost("", "MenuAction/SetRoleByUser", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ strJson = UtilityHelper.HttpPost("", "Role/SetUserRole", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
this.Close();
}
@@ -70,8 +70,8 @@
string strReturn = "";
try
{
- strReturn = UtilityHelper.HttpPost("", "MenuAction/GetRoleByUser", JsonConvert.SerializeObject(_obj));
- ReturnModel<DataTable> dd = UtilityHelper.GetNoPageTableByJson(strReturn);
+ strReturn = UtilityHelper.HttpPost("", "Role/GetUserRole", JsonConvert.SerializeObject(_obj));
+ ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
DataTable dt = dd.rtnData;
this.ckList.DataSource = dt;
this.ckList.ValueMember = "guid";
@@ -110,15 +110,16 @@
string strReturn = "";
try
{
- strReturn = UtilityHelper.HttpPost("", "MenuAction/GetListByUser", JsonConvert.SerializeObject(_obj));
- ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ strReturn = UtilityHelper.HttpPost("", "Role/GetUserMenuAction", JsonConvert.SerializeObject(_obj));
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
DataTable dt = dd.rtnData.list;
DataRow[] drGrp = dt.Select("upGuid='' or upGuid is null");
+ string _gou = "鉁� ";
foreach (DataRow _dy in drGrp)
{
string _orgGuid = _dy["guid"].ToString() + "&";
TreeNode node = new TreeNode();//瀹氫箟缁撶偣
- node.Text = _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node.Text = (_dy["isCk"].ToString() == "1" ? _gou : "") + _dy["name"].ToString();//涓虹粨鐐硅祴鍊�
node.Name = _dy["guid"].ToString();
node.ImageIndex = 0;
node.Checked = (_dy["isCk"].ToString() == "1" ? true : false);
@@ -126,7 +127,7 @@
foreach (DataRow _dy2 in drItem)
{
TreeNode node22 = new TreeNode();//瀹氫箟缁撶偣
- node22.Text = _dy2["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node22.Text = (_dy2["isCk"].ToString() == "1" ? _gou : "") + _dy2["name"].ToString();//涓虹粨鐐硅祴鍊�
node22.Name = _orgGuid + _dy2["guid"].ToString();
node22.ImageIndex = 1;
node22.Checked = (_dy2["isCk"].ToString() == "1" ? true : false);
@@ -134,7 +135,7 @@
foreach (DataRow _dy3 in drItem33)
{
TreeNode node33 = new TreeNode();//瀹氫箟缁撶偣
- node33.Text = _dy3["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node33.Text = (_dy3["isCk"].ToString() == "1" ? _gou : "") + _dy3["name"].ToString();//涓虹粨鐐硅祴鍊�
node33.Name = _orgGuid + _dy3["guid"].ToString();
node33.ImageIndex = 2;
node33.Checked = (_dy3["isCk"].ToString() == "1" ? true : false);
@@ -142,7 +143,7 @@
foreach (DataRow _dy4 in drItem44)
{
TreeNode node44 = new TreeNode();//瀹氫箟缁撶偣
- node44.Text = _dy4["name"].ToString();//涓虹粨鐐硅祴鍊�
+ node44.Text = (_dy4["isCk"].ToString() == "1" ? _gou : "") + _dy4["name"].ToString();//涓虹粨鐐硅祴鍊�
node44.Name = _orgGuid + _dy4["guid"].ToString();
node44.ImageIndex = 3;
node44.Checked = (_dy4["isCk"].ToString() == "1" ? true : false);
--
Gitblit v1.9.3