diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.cs
index e68b6f0..4d239c5 100644
--- a/插件库/Lskj.Main/Control/MainPanelControlEx.cs
+++ b/插件库/Lskj.Main/Control/MainPanelControlEx.cs
@@ -694,11 +694,12 @@ namespace Lskj.Main.Control
                             string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
                             string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
                             Menu_ItemNew menu = new Menu_ItemNew();
+                            menu.Name = groupMenuId;
                             menu.Size = new Size(menuWidth, menuHeight);
                             menu.SetMenuCaption(dataRow["dllShowCaption"] + "");
                             menu.SetRoundRadius = 20;
-                            menu.GetButton().Tag = menuTag;
-                            menu.GetButton().Click += OnMenuItemClick;
+                            menu.Tag = menuTag;
+                            menu.Click += OnMenuItemClick;
                             menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
                             menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
                             baseFlowPanel.Controls.Add(menu);
@@ -727,11 +728,12 @@ namespace Lskj.Main.Control
                             string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
                             string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
                             Menu_ItemNew menu = new Menu_ItemNew();
+                            menu.Name = groupMenuId;
                             menu.Size = new Size(menuWidth, menuHeight);
                             menu.SetMenuCaption(dataRow["dllShowCaption"] + "");
                             menu.SetRoundRadius = 20;
-                            menu.GetButton().Tag = menuTag;
-                            menu.GetButton().Click += OnMenuItemClick;
+                            menu.Tag = menuTag;
+                            menu.Click += OnMenuItemClick;
                             menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
                             menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
                             reportFlowPanel.Controls.Add(menu);
@@ -753,6 +755,11 @@ namespace Lskj.Main.Control
                         baseGroupControl.Height = baseFlowPanel.Controls[baseFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
                         collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
                     };
+                    if (reportTable.Count() == 0 && baseTable.Count() == 0)
+                    {
+                        collectPanel.Visible = false;
+                    }
+                    this.splitMainControl.Panel2Collapsed = true;
                 }
                 foreach (DataRow item in rows)
                 {
@@ -1727,6 +1734,8 @@ namespace Lskj.Main.Control
                             DataRow items = ShortcutDt.Rows.Cast<DataRow>().FirstOrDefault(x => x["DllShowCaption"].ToString() == key);
                             if (items != null)
                             {
+                                string groupMenuId = items["LMenuId"] + "";
+                                Menu_ItemNew menuItem = this._menuItemList.Cast<Menu_ItemNew>().FirstOrDefault(x => x.Name == groupMenuId);
                                 CornerLab corLab = _quickPageHeaders[key];
                                 corLab.Visible = true;
                                 string number = items["amount"] + "";
@@ -1743,6 +1752,10 @@ namespace Lskj.Main.Control
                                 else
                                 {
                                     corLab.SetMenuNum(int.Parse(number));
+                                    if (menuItem != null)
+                                    {
+                                        menuItem.SetMenuNum(int.Parse(number));
+                                    }
                                 }
                             }
                         }
@@ -4142,6 +4155,14 @@ namespace Lskj.Main.Control
                         if (SystemInfo.Instance.DesktopFormatShowGallerys)
                         {
                             this.splitMainControl.Panel2Collapsed = false;
+                            if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout)
+                            {
+                                this.splitMainControl.Panel2Collapsed = true;
+                            }
+                            else
+                            {
+                                this.splitMainControl.Panel2Collapsed = false;
+                            }
                         }
                     }
                     //选中我的桌面