diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
index ac22876..fcc4075 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -2,56 +2,83 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
     <th:block th:include="include :: header('党务列表')" />
+    <th:block th:include="include :: layout-latest-css" />
+    <th:block th:include="include :: ztree-css" />
 </head>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <input type="hidden" name="type" value="党务及意识形态"/>
-                            <li>
-                                <label>简写：</label>
-                                <input type="text" id="shotName" name="shotName"/>
-                            </li>
-                            <li>
-                                <label>负责人：</label>
-                                <select name="head" id="head"></select>
-                            </li>
-                            <li>
-                                <label>审核人：</label>
-                                <select name="reviewed" id="reviewed"></select>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
+    <div class="ui-layout-west">
+        <div class="box box-main">
+            <div class="box-header">
+                <div class="box-title">
+                    <i class="fa fa-sitemap"></i> 组织机构
+                </div>
+                <div class="box-tools pull-right">
+                    <a type="button" class="btn btn-box-tool" href="#" onclick="dept()" title="管理部门"><i class="fa fa-edit"></i></a>
+                    <button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
+                    <button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
+                    <button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新部门"><i class="fa fa-refresh"></i></button>
+                </div>
             </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
+            <div class="ui-layout-content">
+                <div id="tree" class="ztree"></div>
             </div>
         </div>
     </div>
+    <div class="ui-layout-center">
+        <div class="container-div">
+            <div class="row">
+                <div class="col-sm-12 search-collapse">
+                    <form id="formId">
+                        <div class="select-list">
+                            <ul>
+                                <input type="hidden" id="deptId" name="deptId">
+                                <input type="hidden" id="parentId" name="parentId">
+                                <input type="hidden" name="type" value="党务及意识形态"/>
+                                <li>
+                                    <label>简写：</label>
+                                    <input type="text" id="shotName" name="shotName"/>
+                                </li>
+                                <li>
+                                    <label>负责人：</label>
+                                    <select name="head" id="head"></select>
+                                </li>
+                                <li>
+                                    <label>审核人：</label>
+                                    <select name="reviewed" id="reviewed"></select>
+                                </li>
+                                <li>
+                                    <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </form>
+                </div>
+
+                <div class="btn-group-sm" id="toolbar" role="group">
+                    <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="base:affairs:add">
+                        <i class="fa fa-plus"></i> 添加
+                    </a>
+                    <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="base:affairs:edit">
+                        <i class="fa fa-edit"></i> 修改
+                    </a>
+                    <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="base:affairs:remove">
+                        <i class="fa fa-remove"></i> 删除
+                    </a>
+                    <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="base:affairs:export">
+                        <i class="fa fa-download"></i> 导出
+                    </a>
+                </div>
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table"></table>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: layout-latest-js" />
+     <th:block th:include="include :: ztree-js" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
@@ -81,6 +108,19 @@
         })
 
         $(function() {
+            var panehHidden = false;
+            if ($(this).width() < 769) {
+                panehHidden = true;
+            }
+            $('body').layout({ initClosed: panehHidden, west__size: 185 });
+            // 回到顶部绑定
+            if ($.fn.toTop !== undefined) {
+                var opt = {
+                    win:$('.ui-layout-center'),
+                    doc:$('.ui-layout-center')
+                };
+                $('#scroll-up').toTop(opt);
+            }
             var options = {
                 url: prefix + "/list",
                 createUrl: prefix + "/add",
@@ -259,7 +299,55 @@
                     })
                 }
             });
+            queryDeptTree();
         });
+        function queryDeptTree(){
+            var url = ctx + "base/user/deptTreeData";
+            var options = {
+                url: url,
+                expandLevel: 2,
+                onClick : zOnClick
+            };
+            $.tree.init(options);
+
+            function zOnClick(event, treeId, treeNode) {
+                $("#deptId").val(treeNode.id);
+                $("#parentId").val(treeNode.pId);
+                $.table.search();
+            }
+        }
+
+        $('#btnExpand').click(function() {
+            $._tree.expandAll(true);
+            $(this).hide();
+            $('#btnCollapse').show();
+        });
+
+        $('#btnCollapse').click(function() {
+            $._tree.expandAll(false);
+            $(this).hide();
+            $('#btnExpand').show();
+        });
+        $('#btnRefresh').click(function() {
+            queryDeptTree();
+        });
+
+        /* 用户管理-部门 */
+        function dept() {
+            var url = ctx + "base/dept";
+            $.modal.openTab("部门管理", url);
+        }
+
+        /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+        function resetPre() {
+            resetDate();
+            $("#formId")[0].reset();
+            $("#deptId").val("");
+            $("#parentId").val("");
+            $(".curSelectedNode").removeClass("curSelectedNode");
+            $.table.search();
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/cyx-admin/src/main/resources/templates/base/user/user.html b/cyx-admin/src/main/resources/templates/base/user/user.html
index 8520fc6..27bbd17 100644
--- a/cyx-admin/src/main/resources/templates/base/user/user.html
+++ b/cyx-admin/src/main/resources/templates/base/user/user.html
@@ -189,23 +189,7 @@
 		    $.table.init(options);
 		}
 		
-		function queryDeptTree()
-		{
-			var url = ctx + "base/user/deptTreeData";
-			var options = {
-		        url: url,
-		        expandLevel: 2,
-		        onClick : zOnClick
-		    };
-			$.tree.init(options);
-			
-			function zOnClick(event, treeId, treeNode) {
-				$("#deptId").val(treeNode.id);
-				$("#parentId").val(treeNode.pId);
-				$.table.search();
-			}
-		}
-		
+
 		$('#btnExpand').click(function() {
 			$._tree.expandAll(true);
 		    $(this).hide();
