lu
2025-01-21 ad8bc2218ca947b5ce3ab046f1b3f94ce0caefa5
细节
已修改7个文件
199 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookStaff.Designer.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookStaff.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -83,7 +83,7 @@
        }
        /// <summary>
        ///     读取记住密码
        ///  读取记住密码
        /// </summary>
        private void _getRemember()
        {
@@ -106,8 +106,7 @@
        {
            var _version = ConfigurationManager.AppSettings["Version"];
            AutoUpdater.InstalledVersion = new Version(_version);
            AutoUpdater.Start(
                ConfigurationManager.AppSettings["AutoUpdaterXml"]);
            AutoUpdater.Start(ConfigurationManager.AppSettings["AutoUpdaterXml"]);
            AutoUpdater.CheckForUpdateEvent += AutoUpdater_CheckForUpdateEvent;
        }
@@ -169,8 +168,7 @@
            }
            catch (Exception exception)
            {
                MsgHelper.ShowError(exception.Message + ":" +
                                    exception.GetType());
                MsgHelper.ShowError(exception.Message + ":" + exception.GetType());
                Close();
                Application.Exit();
            }
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -46,12 +46,14 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.account = new DevExpress.XtraGrid.Columns.GridColumn();
            this.userName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colCreateBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.createTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lastLoginTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.loginCounter = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colRole = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -61,7 +63,8 @@
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_isStatus = new System.Windows.Forms.CheckBox();
            this.txt_staffId = new Gs.DevApp.UserControl.UcLookStaff();
            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
            this.txt_account = new DevExpress.XtraEditors.TextEdit();
@@ -82,7 +85,7 @@
            this.lbPwd = new DevExpress.XtraEditors.LabelControl();
            this.txt_userName = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -99,6 +102,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
            this.SuspendLayout();
            // 
            // isLocked
@@ -163,6 +167,7 @@
            this.createTime,
            this.lastLoginTime,
            this.loginCounter,
            this.gridColumn3,
            this.colRole,
            this.gridColumn1});
            gridFormatRule1.Column = this.isLocked;
@@ -178,6 +183,17 @@
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "在线状态";
            this.gridColumn2.FieldName = "flagOnline";
            this.gridColumn2.MaxWidth = 50;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 50;
            // 
            // account
            // 
@@ -197,7 +213,7 @@
            // 
            this.userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.userName.AppearanceCell.Options.UseFont = true;
            this.userName.Caption = "用户名";
            this.userName.Caption = "账号名称";
            this.userName.FieldName = "userName";
            this.userName.MinWidth = 50;
            this.userName.Name = "userName";
@@ -261,6 +277,16 @@
            this.loginCounter.VisibleIndex = 7;
            this.loginCounter.Width = 94;
            // 
            // gridColumn3
            //
            this.gridColumn3.Caption = "关联员工";
            this.gridColumn3.FieldName = "staffId";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 8;
            this.gridColumn3.Width = 94;
            //
            // colRole
            // 
            this.colRole.Caption = "角色设置";
@@ -272,7 +298,7 @@
            this.colRole.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
            this.colRole.Tag = "";
            this.colRole.Visible = true;
            this.colRole.VisibleIndex = 8;
            this.colRole.VisibleIndex = 9;
            this.colRole.Width = 94;
            // 
            // repositoryItemButtonEdit1
@@ -298,7 +324,7 @@
            this.gridColumn1.OptionsFilter.AllowFilter = false;
            this.gridColumn1.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 94;
            // 
            // repositoryItemButtonEdit2
@@ -348,13 +374,15 @@
            // 
            this.xtraTabPage2.Controls.Add(this.panel1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(736, 570);
            this.xtraTabPage2.Size = new System.Drawing.Size(1002, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_isStatus);
            this.panel1.Controls.Add(this.txt_staffId);
            this.panel1.Controls.Add(this.labelControl4);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.labelControl10);
            this.panel1.Controls.Add(this.txt_account);
@@ -378,17 +406,27 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(76, 20);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(585, 426);
            this.panel1.Size = new System.Drawing.Size(795, 426);
            this.panel1.TabIndex = 1;
            // 
            // txt_isStatus
            // txt_staffId
            // 
            this.txt_isStatus.AutoSize = true;
            this.txt_isStatus.Location = new System.Drawing.Point(125, 342);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
            this.txt_isStatus.TabIndex = 133;
            this.txt_isStatus.UseVisualStyleBackColor = true;
            this.txt_staffId.IsReadly = false;
            this.txt_staffId.Location = new System.Drawing.Point(473, 48);
            this.txt_staffId.Name = "txt_staffId";
            this.txt_staffId.Size = new System.Drawing.Size(274, 30);
            this.txt_staffId.TabIndex = 135;
            //
            // labelControl4
            //
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(473, 20);
            this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(85, 21);
            this.labelControl4.TabIndex = 134;
            this.labelControl4.Text = "关联员工:";
            // 
            // labelControl11
            // 
@@ -425,7 +463,7 @@
            // 
            this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl8.Appearance.Options.UseFont = true;
            this.labelControl8.Location = new System.Drawing.Point(31, 20);
            this.labelControl8.Location = new System.Drawing.Point(36, 20);
            this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl8.Name = "labelControl8";
            this.labelControl8.Size = new System.Drawing.Size(85, 21);
@@ -434,7 +472,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(125, 256);
            this.txt_remark.Location = new System.Drawing.Point(125, 216);
            this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -447,7 +485,7 @@
            // 
            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl7.Appearance.Options.UseFont = true;
            this.labelControl7.Location = new System.Drawing.Point(61, 256);
            this.labelControl7.Location = new System.Drawing.Point(70, 216);
            this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl7.Name = "labelControl7";
            this.labelControl7.Size = new System.Drawing.Size(51, 21);
@@ -456,7 +494,7 @@
            // 
            // txt_address
            // 
            this.txt_address.Location = new System.Drawing.Point(125, 216);
            this.txt_address.Location = new System.Drawing.Point(125, 182);
            this.txt_address.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_address.Name = "txt_address";
            this.txt_address.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -468,7 +506,7 @@
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(31, 220);
            this.labelControl3.Location = new System.Drawing.Point(36, 186);
            this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(85, 21);
@@ -477,7 +515,7 @@
            // 
            // txt_tel
            // 
            this.txt_tel.Location = new System.Drawing.Point(125, 176);
            this.txt_tel.Location = new System.Drawing.Point(125, 149);
            this.txt_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_tel.Name = "txt_tel";
            this.txt_tel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -489,7 +527,7 @@
            // 
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(61, 180);
            this.labelControl1.Location = new System.Drawing.Point(70, 153);
            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(51, 21);
@@ -498,7 +536,7 @@
            // 
            // txt_email
            // 
            this.txt_email.Location = new System.Drawing.Point(125, 136);
            this.txt_email.Location = new System.Drawing.Point(125, 115);
            this.txt_email.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_email.Name = "txt_email";
            this.txt_email.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -519,7 +557,7 @@
            // 
            this.tipPwd.Appearance.ForeColor = System.Drawing.Color.Red;
            this.tipPwd.Appearance.Options.UseForeColor = true;
            this.tipPwd.Location = new System.Drawing.Point(434, 59);
            this.tipPwd.Location = new System.Drawing.Point(434, 54);
            this.tipPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.tipPwd.Name = "tipPwd";
            this.tipPwd.Size = new System.Drawing.Size(8, 18);
@@ -530,7 +568,7 @@
            // 
            this.labelControl9.Appearance.ForeColor = System.Drawing.Color.Red;
            this.labelControl9.Appearance.Options.UseForeColor = true;
            this.labelControl9.Location = new System.Drawing.Point(434, 96);
            this.labelControl9.Location = new System.Drawing.Point(434, 82);
            this.labelControl9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl9.Name = "labelControl9";
            this.labelControl9.Size = new System.Drawing.Size(8, 18);
@@ -541,7 +579,7 @@
            // 
            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl6.Appearance.Options.UseFont = true;
            this.labelControl6.Location = new System.Drawing.Point(61, 140);
            this.labelControl6.Location = new System.Drawing.Point(70, 119);
            this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl6.Name = "labelControl6";
            this.labelControl6.Size = new System.Drawing.Size(51, 21);
@@ -552,7 +590,7 @@
            // 
            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl5.Appearance.Options.UseFont = true;
            this.labelControl5.Location = new System.Drawing.Point(31, 340);
            this.labelControl5.Location = new System.Drawing.Point(36, 288);
            this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl5.Name = "labelControl5";
            this.labelControl5.Size = new System.Drawing.Size(85, 21);
@@ -561,7 +599,7 @@
            // 
            // txt_password
            // 
            this.txt_password.Location = new System.Drawing.Point(125, 56);
            this.txt_password.Location = new System.Drawing.Point(125, 49);
            this.txt_password.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_password.Name = "txt_password";
            this.txt_password.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -573,7 +611,7 @@
            // 
            this.lbPwd.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lbPwd.Appearance.Options.UseFont = true;
            this.lbPwd.Location = new System.Drawing.Point(31, 60);
            this.lbPwd.Location = new System.Drawing.Point(36, 53);
            this.lbPwd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.lbPwd.Name = "lbPwd";
            this.lbPwd.Size = new System.Drawing.Size(85, 21);
@@ -582,7 +620,7 @@
            // 
            // txt_userName
            // 
            this.txt_userName.Location = new System.Drawing.Point(125, 96);
            this.txt_userName.Location = new System.Drawing.Point(125, 82);
            this.txt_userName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_userName.Name = "txt_userName";
            this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -594,23 +632,21 @@
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(61, 100);
            this.labelControl2.Location = new System.Drawing.Point(36, 86);
            this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(51, 21);
            this.labelControl2.Size = new System.Drawing.Size(85, 21);
            this.labelControl2.TabIndex = 94;
            this.labelControl2.Text = "姓名:";
            this.labelControl2.Text = "账号名称:";
            // 
            // gridColumn2
            // txt_isStatus
            // 
            this.gridColumn2.Caption = "在线状态";
            this.gridColumn2.FieldName = "flagOnline";
            this.gridColumn2.MaxWidth = 50;
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 50;
            this.txt_isStatus.Location = new System.Drawing.Point(125, 286);
            this.txt_isStatus.Name = "txt_isStatus";
            this.txt_isStatus.Properties.Caption = "";
            this.txt_isStatus.Size = new System.Drawing.Size(94, 24);
            this.txt_isStatus.TabIndex = 227;
            this.txt_isStatus.Tag = "moren.true";
            // 
            // User
            // 
@@ -638,6 +674,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_email.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_password.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
            this.ResumeLayout(false);
        }
@@ -682,8 +719,11 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
        private System.Windows.Forms.CheckBox txt_isStatus;
        private DevExpress.XtraEditors.LabelControl labelControl5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraEditors.LabelControl labelControl4;
        private UserControl.UcLookStaff txt_staffId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraEditors.CheckEdit txt_isStatus;
    }
}
DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -221,7 +221,7 @@
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                account = txt_account.Text.Trim(),
                password = txt_password.Text.Trim(),
                userName = txt_userName.Text.Trim(),
@@ -230,7 +230,8 @@
                email = txt_email.Text.Trim(),
                isStatus = txt_isStatus.Checked,
                remark = txt_remark.Text.Trim(),
                isSys = 0
                isSys = 0,
                staffId= txt_staffId.GetId()
            };
            try
            {
@@ -258,7 +259,7 @@
        private   void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ACCOUNT asc ,CREATE_TIME",
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.ACCOUNT asc ,a.CREATE_TIME",
                "desc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -97,11 +97,10 @@
        {
            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
@@ -117,65 +116,37 @@
                var _gou = "✔ ";
                foreach (var _dy in drGrp)
                {
                    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);
                }
DevApp/Gs.DevApp/UserControl/UcLookStaff.Designer.cs
@@ -81,8 +81,6 @@
            this.gridColumn1.FieldName = "id";
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            // 
            // gridColumn2
            // 
@@ -91,7 +89,7 @@
            this.gridColumn2.MinWidth = 80;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 80;
            // 
            // gridColumn3
@@ -101,7 +99,7 @@
            this.gridColumn3.MinWidth = 100;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 100;
            // 
            // gridColumn4
DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
@@ -41,7 +41,7 @@
        private void getSuppler()
        {
            var pgq = new PageQueryModel(1, 999999, "a.staff_no", "asc", "", " and 1=1");
            var pgq = new PageQueryModel(1, 999999, "org.FNumber asc,a.staff_no", "asc", "", " and 1=1");
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -51,6 +51,8 @@
                lookSearchSupplier.Properties.DataSource = dt;
                lookSearchSupplier.Properties.DisplayMember = "staffName";
                lookSearchSupplier.Properties.ValueMember = "id";
                lookSearchSupplier.ForceInitialize();
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -151,6 +151,7 @@
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
            this.bar2.OptionsBar.AllowQuickCustomization = false;
            this.bar2.OptionsBar.MultiLine = true;
            this.bar2.OptionsBar.UseWholeRow = true;
            this.bar2.Text = "Main menu";