From 40036d84a94b47b82b2d6316fb63df5e2847c6df Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 10 七月 2025 11:17:46 +0800
Subject: [PATCH] 首检

---
 DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs |   89 ++++++++++++++++++++++----------------------
 1 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
index a178965..c757f27 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
@@ -1,16 +1,8 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Properties;
+锘縰sing Gs.DevApp.Properties;
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm.User
@@ -19,14 +11,25 @@
     {
         private StringBuilder _actionLst = new StringBuilder();
         private readonly string _rightGuid;
-        public RoleSelectAction(string rightGuid)
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="rightGuid">涓汉guid锛屾垨瑙掕壊guid</param>
+        /// <param name="formTxt"></param>
+        public RoleSelectAction(string rightGuid,string formTxt)
         {
             InitializeComponent();
+            this.Text = formTxt;
             trv.AfterCheck += Trv_AfterCheck;
             _rightGuid = rightGuid;
             getTree(_rightGuid);
         }
-
+        /// <summary>
+        /// 璇诲彇鏉冮檺鍒楄〃
+        /// </summary>
+        /// <param name="roleGuid"></param>
         private void getTree(string roleGuid)
         {
             trv.Nodes.Clear();
@@ -49,57 +52,32 @@
                 var drGrp = dt.Select("upGuid='' or upGuid is null");
                 foreach (var _dy in drGrp)
                 {
-                    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;
-                    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["name"].ToString(); //涓虹粨鐐硅祴鍊�
-                        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["name"].ToString(); //涓虹粨鐐硅祴鍊�
-                            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["name"].ToString(); //涓虹粨鐐硅祴鍊�
-                                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();
+                        //node22.Expand() ;
                         node.Nodes.Add(node22);
                     }
-
                     node.Expand();
                     trv.Nodes.Add(node);
                 }
@@ -139,6 +117,11 @@
                 if (node.Nodes.Count > 0) TraverseTreeViewNodes(node.Nodes);
             }
         }
+        /// <summary>
+        /// 淇濆瓨瑙掕壊鐨勬潈闄�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void btnSave_Click(object sender, EventArgs e)
         {
             string rowGuid = _rightGuid;
@@ -147,7 +130,6 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-
             if (!MsgHelper.AskQuestion("纭畾璁剧疆鏉冮檺鍚楋紵"))
                 return;
             _actionLst = new StringBuilder();
@@ -164,11 +146,30 @@
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+                if (_rtn.rtnCode > 0)
+                    this.Close();
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        private void btnOpen_Click(object sender, EventArgs e)
+        {
+            if (btnOpen.Text == "鍏ㄩ儴灞曞紑")
+            {
+                trv.ExpandAll();
+                btnOpen.Text = "鍏ㄩ儴鏀舵嫝";
+                return;
+            }
+
+            if (btnOpen.Text == "鍏ㄩ儴鏀舵嫝")
+            {
+                trv.CollapseAll();
+                btnOpen.Text = "鍏ㄩ儴灞曞紑";
+                return;
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3