From e35996f9b2a60548ef0af55032fb724c3eedf3f4 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 18 Aug 2020 09:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   2 +-
 .../manage/controller/LoginController.java    |   4 -
 .../src/main/webapp/WEB-INF/jspf/common.jspf  |  11 +-
 .../webapp/WEB-INF/views/deptDir/dept.jsp     |   8 -
 .../WEB-INF/views/noticeDir/noticePage.jsp    |  10 -
 .../views/otherManage/backupDatabase.jsp      |  85 ++---
 .../WEB-INF/views/roleDir/roleNotDown.jsp     |   8 -
 .../webapp/WEB-INF/views/userDir/user.jsp     |  81 ++---
 .../src/main/webapp/static/css/comm.css       |  12 +
 power-admin/src/main/webapp/static/js/dept.js |   2 +
 .../src/main/webapp/static/js/noticePage.js   |   2 +
 .../src/main/webapp/static/js/roleNotDown.js  |   2 +
 power-admin/src/main/webapp/static/js/user.js | 340 +++++++++---------
 .../manage/service/cache/CacheManager.java    |   6 +-
 .../manage/service/cache/CacheManager.class   | Bin 3543 -> 3566 bytes
 15 files changed, 274 insertions(+), 299 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3bdf990..7a45b09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/power-service/target/
+target
 /.idea/
 *.iml
\ No newline at end of file
diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java
index d7de67c..a2a2e65 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -55,10 +55,6 @@ public class LoginController {
             //添加进操作日志
             Power_Log log = new Power_Log();
             if(user != null){
-                //如处于登录状态，先清除缓存
-                //CacheManager.removeCacheByObject(user);
-                //记住
-                MyCookieUtil.remember(request, response);
                 //存session密码置空
                 //是否记住密码功能
                 MyCookieUtil.remember(request, response);
diff --git a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
index 6a312f6..335899e 100644
--- a/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
+++ b/power-admin/src/main/webapp/WEB-INF/jspf/common.jspf
@@ -62,8 +62,17 @@
     }
     //重设表格高度
     function reloadTableHeight(tableId) {
-        $("#"+tableId+".fixed-table-container").css({ "padding-bottom": "0px", height: $("#"+tableId+".fixed-table-body table").height() + 20 });
+        //获取表格内容高度
+        var height = $(".fixed-table-body #"+tableId).height();
+        //刷新
         $('#'+tableId).bootstrapTable('resetView', { height: "auto" });
+        //计算body所需高度
+        var tableBodyHeight = height-6;
+        //赋值body高度，且定义最高高度
+        if(maxHeight == 0){
+            maxHeight = tableBodyHeight;
+        }
+        $(".fixed-table-body").css({height:tableBodyHeight,"max-height":maxHeight});
     }
 </script>
 <%@ include file="/WEB-INF/jspf/confirmJsp.jspf"%>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
index 84d31bd..269c4a0 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/deptDir/dept.jsp
@@ -36,11 +36,6 @@
             width:50%;
             float:left;
         }
-        /*按钮组*/
-        .btns{
-            text-align: right;
-            margin-bottom: 5px;
-        }
         /*模态框*/
         .modal-header{
             text-align: center;
@@ -59,9 +54,6 @@
         .operBtns{
             margin-left:10px;
         }
-        .tableDiv{
-            margin-left:14px;
-        }
         .shortInput{
             width:80px;
         }
diff --git a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp
index cf3710b..c05ad1c 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/noticeDir/noticePage.jsp
@@ -48,11 +48,6 @@
             width:50%;
             float:left;
         }
-        /*按钮组*/
-        .btns{
-            text-align: right;
-            margin-bottom: 10px;
-        }
         /*模态框*/
         .modal-header{
             text-align: center;
@@ -69,11 +64,6 @@
             margin-left: 38px;
             margin-bottom: 16px;
         }
-        .tableDiv{
-            margin-left:15px;
-            margin-right:25px;
-            padding-right: 15px;
-        }
         .shortInput{
             width:80px;
         }
diff --git a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
index 101458a..f104a1b 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
@@ -71,69 +71,52 @@
             padding-top: 3px;
             margin-left: 2%;
         }
-
-        /**查询按钮组*/
-        .btnsDiv {
-            width: 100%;
-            height: 32px;
-            text-align: right;
-            padding-top: 5px;
-            padding-right: 22px;
-        }
-
-        /**表格div*/
-        .tableDiv {
-            margin-left: 14px;
-            margin-top: -9px !important;
-        }
     </style>
 </head>
 <body>
-<div class="main">
-    <div class="">
-        <div class="panel-heading"><h4>其他管理/日志管理</h4></div>
-        <hr>
-        <div class="searchDiv">
-            <div class="searchInput left" style="margin-left: 14px">
-                <div class="searchElement left">
+<div style="width: 100%;height: 100%;overflow: auto">
+    <div class="row" style="margin-right: 0px;">
+        <div class="col-md-12">
+            <div class="panel-heading"><h4>其他管理/日志管理</h4></div>
+            <hr>
+            <form class="form-inline searchDiv" role="form">
+                <div class="form-group">
                     <label class="labelDiv">日志主题：</label>
-                </div>
-                <div class="searchInputElement left">
                     <input type="text" class="form-control input-sm" id="logTitle" maxlength="50">
                 </div>
-            </div>
-            <div class="searchInput left">
-                <div class="searchElement left">
-                    <label class="labelDiv">日志内容：</label>
-                </div>
-                <div class="searchInputElement left">
-                    <input type="text" class="form-control input-sm" id="logContent" maxlength="500">
+                <div class="searchInput left">
+                    <div class="searchElement left">
+                        <label class="labelDiv">日志内容：</label>
+                    </div>
+                    <div class="searchInputElement left">
+                        <input type="text" class="form-control input-sm" id="logContent" maxlength="500">
+                    </div>
                 </div>
-            </div>
-            <div class="searchInput left">
-                <div class="searchElement left">
-                    <label class="labelDiv">操作人：</label>
+                <div class="searchInput left">
+                    <div class="searchElement left">
+                        <label class="labelDiv">操作人：</label>
+                    </div>
+                    <div class="searchInputElement left">
+                        <input type="text" class="form-control input-sm" id="creater" maxlength="8">
+                    </div>
                 </div>
-                <div class="searchInputElement left">
-                    <input type="text" class="form-control input-sm" id="creater" maxlength="8">
+                <div class="dateSearchDiv left">
+                    <div class="dateLabelDiv left">
+                        <label class="labelDiv">操作时间：</label>
+                    </div>
+                    <div class="dateSearchInput left">
+                        <input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间" maxlength="10" autocomplete="off">
+                    </div>
+                    <div class="dateSearchInput left">
+                        <input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间" maxlength="10" autocomplete="off">
+                    </div>
                 </div>
-            </div>
-            <div class="dateSearchDiv left">
-                <div class="dateLabelDiv left">
-                    <label class="labelDiv">操作时间：</label>
+                <div class="left">
+                    <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
                 </div>
-                <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间" maxlength="10" autocomplete="off">
-                </div>
-                <div class="dateSearchInput left">
-                    <input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间" maxlength="10" autocomplete="off">
-                </div>
-            </div>
-            <div class="left">
-                <button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
             </div>
         </div>
-        <div class="btnsDiv">
+        <div class="btns">
             <pm:myPermissions permissions="/otherManage/exportExcel">
                 <button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出
                 </button>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
index f04f705..d403df8 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/roleDir/roleNotDown.jsp
@@ -36,11 +36,6 @@
             width:50%;
             float:left;
         }
-        /*按钮组*/
-        .btns{
-            text-align: right;
-            margin-bottom: 5px;
-        }
         /*模态框*/
         .modal-header{
             text-align: center;
@@ -56,9 +51,6 @@
             margin-left: 38px;
             margin-bottom: 16px;
         }
-        .tableDiv{
-            margin-left:14px;
-        }
         .shortInput{
             width:80px;
         }
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
index abefd87..93712d8 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
@@ -40,12 +40,6 @@
             width:50%;
             float:left;
         }
-        /*按钮组*/
-        .btns{
-            margin-top:5px;
-            text-align: right;
-            margin-bottom: 5px;
-        }
         /*模态框*/
         .modal-header{
             text-align: center;
@@ -64,9 +58,6 @@
         .operBtns{
             margin-left:10px;
         }
-        .tableDiv{
-            margin-left:14px;
-        }
         .shortInput{
             width:80px;
         }
@@ -103,45 +94,43 @@
             <div class="panel-heading"><h4>基本管理/用户管理</h4></div>
             <hr>
             <form class="form-inline searchDiv" role="form">
-                <div class="">
-                    <div class="form-group">
-                        <label for="user_name">账号:</label>
-                        <input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
-                    </div>
-                   <%-- <div class="form-group">
-                        <label for="user_email">邮箱地址:</label>
-                        <input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
-                    </div>--%>
-                    <div class="form-group">
-                        <label>所属角色:</label>
-                        <div class=" form-group form-inline">
-                            <select class=" form-control input-sm" style="width:106px" id="roleId">
-                                <option value="">全部</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="dept_id">所属科室:</label>
-                        <div class=" form-group form-inline">
-                            <select class="form-control input-sm" style="width:106px" id="dept_id">
-                                <option value="">全部</option>
-                            </select>
-                        </div>
+                <div class="form-group">
+                    <label for="user_name">账号:</label>
+                    <input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
+                </div>
+               <%-- <div class="form-group">
+                    <label for="user_email">邮箱地址:</label>
+                    <input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
+                </div>--%>
+                <div class="form-group">
+                    <label>所属角色:</label>
+                    <div class=" form-group form-inline">
+                        <select class=" form-control input-sm" style="width:106px" id="roleId">
+                            <option value="">全部</option>
+                        </select>
                     </div>
-                    <div class="form-group">
-                        <label for="effective">是否有效:</label>
-                        <div class=" form-group form-inline">
-                            <select class=" form-control input-sm" id="effective">
-                                <option value="">全部</option>
-                                <option value="1">是</option>
-                                <option value="0">否</option>
-                            </select>
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label for="dept_id">所属科室:</label>
+                    <div class=" form-group form-inline">
+                        <select class="form-control input-sm" style="width:106px" id="dept_id">
+                            <option value="">全部</option>
+                        </select>
                     </div>
-                    <div class="form-group">
-                        <button type="button" id="queryBtn" class="btn btn-primary btn-sm form-group">查询</button>
+                </div>
+                <div class="form-group">
+                    <label for="effective">是否有效:</label>
+                    <div class=" form-group form-inline">
+                        <select class=" form-control input-sm" id="effective">
+                            <option value="">全部</option>
+                            <option value="1">是</option>
+                            <option value="0">否</option>
+                        </select>
                     </div>
                 </div>
+                <div class="form-group">
+                    <button type="button" id="queryBtn" class="btn btn-primary btn-sm form-group">查询</button>
+                </div>
             </form>
         </div>
     </div>
@@ -159,7 +148,9 @@
             <button type="button" class="btn btn-primary btn-sm" onclick="exportExcel()">导出Excel</button>
         </pm:myPermissions>
     </div>
-    <table id="bootstrapTable" class="table text-nowrap table-striped"></table>
+    <div class="tableDiv">
+        <table id="bootstrapTable" class="table text-nowrap table-striped"></table>
+    </div>
 </div>
 <!-- 模态框（Modal） -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
diff --git a/power-admin/src/main/webapp/static/css/comm.css b/power-admin/src/main/webapp/static/css/comm.css
index 88506ac..d60c6e8 100644
--- a/power-admin/src/main/webapp/static/css/comm.css
+++ b/power-admin/src/main/webapp/static/css/comm.css
@@ -22,4 +22,16 @@
     margin-left: 5px;
     margin-top: 3px;
     height: 30px;
+}
+/*表格外层div*/
+.tableDiv{
+    margin-left:14px;
+    margin-right:15px;
+}
+/*按钮组*/
+.btns{
+    margin-top:5px;
+    margin-right:15px;
+    text-align: right;
+    margin-bottom: 5px;
 }
\ No newline at end of file
diff --git a/power-admin/src/main/webapp/static/js/dept.js b/power-admin/src/main/webapp/static/js/dept.js
index 9e14ba0..9b0ac91 100644
--- a/power-admin/src/main/webapp/static/js/dept.js
+++ b/power-admin/src/main/webapp/static/js/dept.js
@@ -1,5 +1,7 @@
 var form = ''
 var pageNumber = 1;
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
     var columns = [];
     columns.push({
diff --git a/power-admin/src/main/webapp/static/js/noticePage.js b/power-admin/src/main/webapp/static/js/noticePage.js
index 229b900..f5a4b08 100644
--- a/power-admin/src/main/webapp/static/js/noticePage.js
+++ b/power-admin/src/main/webapp/static/js/noticePage.js
@@ -1,5 +1,7 @@
 //初始化时间控件
 initDateInput(1);
+//定义表格内容最大高度
+var maxHeight = 0;
 var setting = {
 	view:{
 			fontCss : {"font-family": "微软雅黑","color":"blue"}
diff --git a/power-admin/src/main/webapp/static/js/roleNotDown.js b/power-admin/src/main/webapp/static/js/roleNotDown.js
index 1377342..698cedb 100644
--- a/power-admin/src/main/webapp/static/js/roleNotDown.js
+++ b/power-admin/src/main/webapp/static/js/roleNotDown.js
@@ -3,6 +3,8 @@
  */
 var pageNumber = 1;
 var form = '';
+//定义表格内容最大高度
+var maxHeight = 0;
 $(function(){
     $('#myModal').modal('hide');
     //先销毁表格
diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js
index 528f3c8..6b0b2fe 100644
--- a/power-admin/src/main/webapp/static/js/user.js
+++ b/power-admin/src/main/webapp/static/js/user.js
@@ -1,186 +1,188 @@
 var pageNumber=1;
 var form = '';
-    $(function(){
-        $('#myModal').modal('hide');
-        loadDept();
-        loadRole();
-        //先销毁表格
-        $('#bootstrapTable').bootstrapTable({
-            //表格高度
-            //height: getHeight(),
-            method : 'get',
-            url :path+ "/user/pageList",//请求路径
-            striped : true, //是否显示行间隔色
-            pageNumber : 1, //初始化加载第一页
-            pagination : true,//是否分页
-            sidePagination : 'server',//server:服务器端分页|client：前端分页
-            pageSize : 10,//单页记录数
-            pageList : [ 5, 10, 20, 30 ],//可选择单页记录数
-            cache: false,
-            paginationPreText : '上一页',
-            paginationNextText : '下一页',
-            queryParams : function(params) {//上传服务器的参数
-                var temp = {//如果是在服务器端实现分页，limit、offset这两个参数是必须的
-                    limit : params.limit, // 每页显示数量
-                    offset : params.offset, // SQL语句起始索引
-                    page : (params.offset / params.limit) + 1, //当前页码
-                    userName:$("#user_name").val(),
-                    userEmail:$("#user_email").val(),
-                    searchRoleId:$("#roleId").val(),
-                    deptId : $("#dept_id option:selected").val(),
-                    effective : $("#effective option:selected").val(),
-                };
-                return temp;
+//定义表格内容最大高度
+var maxHeight = 0;
+$(function(){
+    $('#myModal').modal('hide');
+    loadDept();
+    loadRole();
+    //先销毁表格
+    $('#bootstrapTable').bootstrapTable({
+        //表格高度
+        //height: getHeight(),
+        method : 'get',
+        url :path+ "/user/pageList",//请求路径
+        striped : true, //是否显示行间隔色
+        pageNumber : 1, //初始化加载第一页
+        pagination : true,//是否分页
+        sidePagination : 'server',//server:服务器端分页|client：前端分页
+        pageSize : 10,//单页记录数
+        pageList : [ 5, 10, 20, 30 ],//可选择单页记录数
+        cache: false,
+        paginationPreText : '上一页',
+        paginationNextText : '下一页',
+        queryParams : function(params) {//上传服务器的参数
+            var temp = {//如果是在服务器端实现分页，limit、offset这两个参数是必须的
+                limit : params.limit, // 每页显示数量
+                offset : params.offset, // SQL语句起始索引
+                page : (params.offset / params.limit) + 1, //当前页码
+                userName:$("#user_name").val(),
+                userEmail:$("#user_email").val(),
+                searchRoleId:$("#roleId").val(),
+                deptId : $("#dept_id option:selected").val(),
+                effective : $("#effective option:selected").val(),
+            };
+            return temp;
+        },
+        columns : [{
+                checkbox:true
             },
-            columns : [{
-                    checkbox:true
-                },
-                {
-                    title:'序号',
-                    field:'no',
-                    formatter: function (value, row, index) {
-                        //获取每页显示的数量
-                        var pageSize = $('#bootstrapTable').bootstrapTable('getOptions').pageSize;
-                        //获取当前是第几页
-                        if(pageNumber == 1){
-                            pageNumber = $('#bootstrapTable').bootstrapTable('getOptions').pageNumber;
-                        }
-                        //返回序号，注意index是从0开始的，所以要加上1
-                        return pageSize * (pageNumber - 1) + index + 1;
-                    }
-                },
-                {
-                    title:'账号',
-                    field:'userName',
-                },
-                {
-                    title:'姓名',
-                    field:'name',
-                },
-                {
-                    title:'性别',
-                    field:'userSex',
-                    formatter: function (value, row, index) {
-                        if(value ==1){
-                            return '女'
-                        }else if(value ==0){
-                            return '男'
-                        }
-                    }
-                },
-                {
-                    title:'年龄',
-                    field:'userAge',
-                },
-                {
-                    title:'移动电话',
-                    field:'userTel',
-                },
-                {
-                    title:'邮箱地址',
-                    field:'userEmail',
-                },
-                {
-                    title:'用户职位',
-                    field:'userPosition',
-                },
-                {
-                    title:'所属角色',
-                    field:'roleName',
-                },
-                {
-                    title:'所属科室',
-                    field:'powerDepts',
-                    formatter:paramsMatter,
-                },
-                {
-                    title:'是否有效',
-                    field:'effective',
-                    formatter: function (value, row, index) {
-                        if(value ==1){
-                            return '是'
-                        }else if(value ==0){
-                            return '否'
-                        }
+            {
+                title:'序号',
+                field:'no',
+                formatter: function (value, row, index) {
+                    //获取每页显示的数量
+                    var pageSize = $('#bootstrapTable').bootstrapTable('getOptions').pageSize;
+                    //获取当前是第几页
+                    if(pageNumber == 1){
+                        pageNumber = $('#bootstrapTable').bootstrapTable('getOptions').pageNumber;
                     }
-                },
-                {
-                    title:'创建时间',
-                    field:'createDate',
-                },
-                {
-                    title:'创建人',
-                    field:'creater',
-                },
-                {
-                    title:'修改时间',
-                    field:'updateDate',
-                },
-                {
-                    title:'修改人',
-                    field:'updater',
-                },
-                {
-                    title:'操作',
-                    field:'userId', formatter: function(value,row,index){
-                        var editanddrop  = '';
-                        if(row.isUpdate == 1){
-                            editanddrop += '<button type="button" onclick="edit('+row.userId+')" class="btn btn-info operBtns btn-sm" >编辑</button>';
-                        }
-                        if(row.isDelete == 1){
-                            editanddrop += '<button type="button" onclick="drop('+row.userId+')" class="btn btn-danger operBtns btn-sm">删除</button>';
-                        }
-                        return editanddrop;
+                    //返回序号，注意index是从0开始的，所以要加上1
+                    return pageSize * (pageNumber - 1) + index + 1;
+                }
+            },
+            {
+                title:'账号',
+                field:'userName',
+            },
+            {
+                title:'姓名',
+                field:'name',
+            },
+            {
+                title:'性别',
+                field:'userSex',
+                formatter: function (value, row, index) {
+                    if(value ==1){
+                        return '女'
+                    }else if(value ==0){
+                        return '男'
                     }
                 }
-            ],
-            onLoadSuccess: function(){  //加载成功时执行
-                $(".page-list").show();
-                $("th").css({'text-align':'center','vertical-align':'middle'});
-                $("td").css({'text-align':'center','vertical-align':'middle'});
-                reloadTableHeight("bootstrapTable");
             },
-            //监听分页点击事件
-            onPageChange: function(num, type) {
-                pageNumber = num;
+            {
+                title:'年龄',
+                field:'userAge',
+            },
+            {
+                title:'移动电话',
+                field:'userTel',
+            },
+            {
+                title:'邮箱地址',
+                field:'userEmail',
+            },
+            {
+                title:'用户职位',
+                field:'userPosition',
             },
-            //选中单个复选框
-            onCheck:function(row){
-                var checks = $("#checks").val();
-                var userNames = $("#userNames").val();
-                $("#checks").val(checks+=row.userId + ",");
-                $("#userNames").val(userNames+=row.userName + ",");
+            {
+                title:'所属角色',
+                field:'roleName',
             },
-            //取消单个复选框
-            onUncheck:function(row){
-                var checks = $("#checks").val();
-                var userNames = $("#userNames").val();
-                checks = checks.replace(row.userId + ",","");
-                userNames = userNames.replace(row.userName + ",","");
-                $("#checks").val(checks);
-                $("#userNames").val(userNames);
+            {
+                title:'所属科室',
+                field:'powerDepts',
+                formatter:paramsMatter,
             },
-            //全选
-            onCheckAll:function(rows){
-                $("#checks").val("");
-                $("#userNames").val("");
-                var checks = '';
-                var userNames = '';
-                for(var i=0;i<rows.length;i++)
-                {
-                    checks += rows[i].userId + ","
-                    userNames += rows[i].userName + ","
+            {
+                title:'是否有效',
+                field:'effective',
+                formatter: function (value, row, index) {
+                    if(value ==1){
+                        return '是'
+                    }else if(value ==0){
+                        return '否'
+                    }
                 }
-                $("#checks").val(checks);
-                $("#userNames").val(userNames);
             },
-            //全不选
-            onUncheckAll: function (rows) {
-                $("#checks").val("");
-                $("#userNames").val("");
+            {
+                title:'创建时间',
+                field:'createDate',
+            },
+            {
+                title:'创建人',
+                field:'creater',
+            },
+            {
+                title:'修改时间',
+                field:'updateDate',
+            },
+            {
+                title:'修改人',
+                field:'updater',
+            },
+            {
+                title:'操作',
+                field:'userId', formatter: function(value,row,index){
+                    var editanddrop  = '';
+                    if(row.isUpdate == 1){
+                        editanddrop += '<button type="button" onclick="edit('+row.userId+')" class="btn btn-info operBtns btn-sm" >编辑</button>';
+                    }
+                    if(row.isDelete == 1){
+                        editanddrop += '<button type="button" onclick="drop('+row.userId+')" class="btn btn-danger operBtns btn-sm">删除</button>';
+                    }
+                    return editanddrop;
+                }
             }
-        });
+        ],
+        onLoadSuccess: function(){  //加载成功时执行
+            $(".page-list").show();
+            $("th").css({'text-align':'center','vertical-align':'middle'});
+            $("td").css({'text-align':'center','vertical-align':'middle'});
+            reloadTableHeight("bootstrapTable");
+        },
+        //监听分页点击事件
+        onPageChange: function(num, type) {
+            pageNumber = num;
+        },
+        //选中单个复选框
+        onCheck:function(row){
+            var checks = $("#checks").val();
+            var userNames = $("#userNames").val();
+            $("#checks").val(checks+=row.userId + ",");
+            $("#userNames").val(userNames+=row.userName + ",");
+        },
+        //取消单个复选框
+        onUncheck:function(row){
+            var checks = $("#checks").val();
+            var userNames = $("#userNames").val();
+            checks = checks.replace(row.userId + ",","");
+            userNames = userNames.replace(row.userName + ",","");
+            $("#checks").val(checks);
+            $("#userNames").val(userNames);
+        },
+        //全选
+        onCheckAll:function(rows){
+            $("#checks").val("");
+            $("#userNames").val("");
+            var checks = '';
+            var userNames = '';
+            for(var i=0;i<rows.length;i++)
+            {
+                checks += rows[i].userId + ","
+                userNames += rows[i].userName + ","
+            }
+            $("#checks").val(checks);
+            $("#userNames").val(userNames);
+        },
+        //全不选
+        onUncheckAll: function (rows) {
+            $("#checks").val("");
+            $("#userNames").val("");
+        }
     });
+});
 //格式化科室列
 function paramsMatter(value, row, index) {
     value = '<p class="hidden-xs" title="'+value+'">'+value+'</p>'
diff --git a/power-service/src/main/java/com/manage/service/cache/CacheManager.java b/power-service/src/main/java/com/manage/service/cache/CacheManager.java
index a1ccd33..ed87d35 100644
--- a/power-service/src/main/java/com/manage/service/cache/CacheManager.java
+++ b/power-service/src/main/java/com/manage/service/cache/CacheManager.java
@@ -49,8 +49,10 @@ public class CacheManager {
     public static void putCache(String key, Cache obj) {
         cacheMap.put(key, obj);
         //移除不属于该token的
-        Power_UserVo powerUser = (Power_UserVo)obj.getValue();
-        CacheManager.removeCacheByObject(powerUser,key);
+        if(obj.getValue() instanceof Power_UserVo) {
+            Power_UserVo powerUser = (Power_UserVo) obj.getValue();
+            CacheManager.removeCacheByObject(powerUser, key);
+        }
     }
 
     public static Cache getCacheInfo(String key) {
diff --git a/power-service/target/classes/com/manage/service/cache/CacheManager.class b/power-service/target/classes/com/manage/service/cache/CacheManager.class
index 3e873fd7e8c0839014e059cf27239865c38fbaac..b44c5e98030cefab107839cba91b722ca480aec4 100644
GIT binary patch
delta 386
zcmW-c%Su9F6oo%Mij+n|sKtR)Btp%=&@N;p6?Hmhkx^!&Zbo)-(5RWvE1Xep(FLMm
zO{IC$=mDDa0<9w(_P_tV_gZ_cFZ0)Y?0TI)Z`SF0(=VgOTA*`>p@8Hw{!I3jNL?xV
zLF|FBTfGyjPGsH~e$tXbMmdUKd5S&?3{k{nngp|C)lF!})O;Naul`BR^LpKC0~?QU
zE{`W6c!h%V*<VV}6QD$h1<@@Lqs$1)qFL=xMnx22kWFkSAH2`mqOS;1CCC<Gwk2ps
z+ci?`GR7X`)Jb!|Bn{^~nDW?;FZ9zn63a0WPKa|#jx%Oxvd_6X7pkt5TZ&6=xb9uH
xbS2ITb5dsrQFJxn6D})uOFBX{q_`}FE%j?G_Dr{B)sjtUYo3?sLvWe{xBuTaHedh%

delta 330
zcmXAk%}PR16otQgZ)T;^A8K(y1&L6*K~afW5e9iPtwhR3mG&=1@8Bz(C+H3OfoRw;
zdVxkwdVr=)TNnq{*=Oyw*E;*h{d6Bb>;dPl-LXhj&3zzY70tWtJtv&aV7rB*1Mw#U
z+1v}!rXco4yf%}4W#UmSo2+n*KH)rrEHKI<F_y@QN&SzDnbS)~l<~2o>1T@yw)q+=
zWeNmYCQOlWR;5{El6724J&%|&!VFWzH-4z=`2;i@WSfw<5o$`?m3ogfb*5-A%|00p
zn5AicLut!5Zuq-?B$s2NoRFl2N1HsSQk|)~;GAo&xa{FAonEr9lq4GzSkWGyw$LB6
SX<pq!DrP6*I%VBAk?tQf`!PcR