Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/user/userManager.js

@@ -1,6 +1,51 @@
  var zdata = [];
  var dept_tree = null;
  var edittype = "add";
+ var cols = [{
+     width: 10,
+     text: '序号',
+     type: 'number',
+     flex: false,
+     colClass: 'text-center'
+ }, {
+     width: 10,
+     text: 'ID',
+     type: 'number',
+     flex: false,
+     colClass: 'text-center'
+ }, {
+     width: 30,
+     text: '姓名',
+     type: 'string',
+     flex: false,
+     sort: 'down',
+     colClass: 'text-center'
+ }, {
+     width: 40,
+     text: '工号',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }, {
+     width: 80,
+     text: '手机号',
+     type: 'string',
+     flex: false,
+     sort: 'down',
+     colClass: 'text-center'
+ }, {
+     width: 80,
+     text: '角色',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }, {
+     width: 160,
+     text: '操作',
+     type: 'string',
+     flex: true,
+     colClass: 'text-center'
+ }];
  $(document).ready(function() {
 
      $("#main_content_title").html("用户管理")
@@ -60,67 +105,8 @@
          checkable: false,
          sortable: false,
          data: {
-             cols: [{
-                 width: 10,
-                 text: '序号',
-                 type: 'number',
-                 flex: false,
-                 colClass: 'text-center'
-             }, {
-                 width: 30,
-                 text: '姓名',
-                 type: 'string',
-                 flex: false,
-                 sort: 'down',
-                 colClass: 'text-center'
-             }, {
-                 width: 40,
-                 text: '工号',
-                 type: 'string',
-                 flex: true,
-                 colClass: 'text-center'
-             }, {
-                 width: 80,
-                 text: '手机号',
-                 type: 'string',
-                 flex: false,
-                 sort: 'down',
-                 colClass: 'text-center'
-             }, {
-                 width: 80,
-                 text: '角色',
-                 type: 'string',
-                 flex: true,
-                 colClass: 'text-center'
-             }, {
-                 width: 160,
-                 text: '操作',
-                 type: 'string',
-                 flex: true,
-                 colClass: 'text-center'
-             }],
-             rows: [{
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }, {
-                 checked: false,
-                 data: [1, '黎明', '15159', '13505159275', '普通用户', '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']
-             }]
+             cols: cols,
+             rows: []
          }
      });
 
@@ -141,6 +127,54 @@
          alert(treeNode.tId + ", " + treeNode.name);
      }
 
+     function zTreeOnClick(event, treeId, treeNode) {
+
+         var userData = {
+             "organid": treeNode.id
+         }
+
+         UserGetList(userData, function(data) {
+                 console.log(data)
+                     //跟新table
+                 var rowdata = [];
+                 if (data != null && data.length > 0) {
+                     for (var i = 0; i < data.length; i++) {
+                         var user = data[i];
+
+                         var attr = "";
+                         if (user.authorities.length > 0) {
+                             for (var j = 0; j < user.authorities.length; j++) {
+                                 var at = user.authorities[j];
+                                 if (attr.length > 0) {
+                                     attr += "," + at.authority;
+                                     continue;
+                                 }
+                                 attr += at.authority;
+                             }
+                         }
+
+
+                         var userdata = {};
+                         userdata["checked"] = false;
+                         userdata["data"] = [i + 1, user.id, user.username, user.workno == null ? -1 : user.workno, user.mobile, attr, '<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>'];
+                         rowdata.push(userdata);
+                     }
+                 }
+
+
+
+                 // 使用data参数更新数据：
+                 $('.datatable').datatable('load', {
+                     cols: cols,
+                     rows: rowdata
+                 });
+
+             },
+             function(error) {
+
+             });
+     };
+
 
      var setting = {
          data: {
@@ -163,7 +197,8 @@
          callback: {
              onRename: zTreeOnRename,
              //  beforeDrop: zTreeBeforeDrop,
-             onRemove: zTreeOnRemove
+             onRemove: zTreeOnRemove,
+             onClick: zTreeOnClick
          },
          edit: {
              enable: true,

VisualInspection/js/util/const.js

@@ -1,7 +1,7 @@
 // 用户
 var USER_LOGIN = "/user/auth/login"
 var USER_LOGOUT = "/user/logout"
-var USER_GET_ALL = "/user/addUser"
+var USER_GET_LIST = "/user/getUserList"
 
 
 var UI_USER_LOGIN = "view/user/login"

VisualInspection/js/util/service.js

@@ -15,6 +15,20 @@ function UserLogin(body, success, fail) {
     });
 }
 
+function UserGetList(data, success, fail) {
+    var url = base_server_url + USER_GET_LIST
+    ajaxPost(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
 
 function MenuGetAll(success, fail) {
     var url = base_server_url + MENU_GET_ALL

VisualInspection/view/appeal_management/appeal_list.html

@@ -1,89 +1,48 @@
-<!doctype html>
-<html>
 
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">    
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
-
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
-
-        <!-- s-->
-        <div id="main" class="container-fluid main">
-            <div class="row">
-                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                    <div id="mum_left" class="mum_left">
-                        <link rel="import" href="/view/mum.html?__inline">
+<!--  start -->
+<div class="container-fluid ">
+        <div class="row">
+            <form  class="form-horizontal">
+                <div class="form-group">
+                    <label for="exampleInputAccount1" class="col-sm-1">稽查日期</label>
+                    <div class="col-sm-2">
+                        <input type="text" id="start-time" class="form-control form-date" placeholder="开始时间">
                     </div>
-                </div>
-                <div class="col-md-10">
-                    <div id="mum_right" class="mum_right">
-
-                        <div class="panel">
-                            <div class="panel-heading">
-                                <ol class="breadcrumb" style="margin-bottom: 0;">
-                                    <li class="active">申诉列表</li>
-                                </ol>
-                            </div>
-                            <div class="panel-body" id="main_content">
-                                <!--  start -->
-                                <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-sm-3">
-                                                <div class="input-group">
-                                                <span class="input-group-addon">稽查日期</span>
-                                                <input class="form-control form-date" style="float:right;"  type="text" >
-                                                </div>
-                                            </div>
-                                            <div class="col-sm-2">
-                                                <input class="form-control form-date" style="float:right;"  type="text" >
-                                            </div>
-                                            <div class="col-sm-3">
-                                                <div class="input-group">
-                                                    <span class="input-group-addon">稽查部门</span>
-                                                    <select class="form-control">
-                                                        <option>请选择</option>
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            
-                                            <div class="col-sm-4">
-                                                <button class="btn btn-primary " type="button">查询</button>
-                                            </div>
-                                        </div>
-                                        <hr>
-                                        <div class="row">
-                                            <!-- 使用一个div来显示数据表格 -->
-                                            <div class="datatable" data-checkable="true" data-sortable="true"></div>
-                                        </div>
-                                        <div class="row" style="text-align:center">
-                                            <ul class="pager center-block">
-                                                <li class="previous"><a href="#">« 上一页</a></li>
-                                                <li><a href="#">1</a></li>
-                                                <li class="active"><a href="#">2</a></li>
-                                                <li><a href="#">3</a></li>
-                                                <li><a href="#">4</a></li>
-                                                <li><a href="#">5</a></li>
-                                                <li class="next"><a href="#">下一页 »</a></li>
-                                            </ul>
-                                        </div>
-
-                                </div>
-                                <!--  end -->          
-                            </div>
-                        </div>
+                    <div class="col-sm-2">
+                        <input type="text" id="end-time" class="form-control form-date" placeholder="截止时间">
+                    </div>
+                    <label for="exampleInputAccount1" class="col-sm-1">稽查部门</label>
+                    <div class="col-sm-2">
+                        <select class="form-control">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
+                    <div class="col-sm-2">
+                        <button class="btn btn-primary " type="button">查询</button>
                     </div>
                 </div>
-            </div>
+            </form>
+        </div>
+        <hr style="margin-top:0px;">
+        <div class="row">
+            <!-- 使用一个div来显示数据表格 -->
+            <div class="datatable" data-checkable="true" data-sortable="true"></div>
         </div>
-        <!-- e-->
+        <div class="row" style="text-align:center">
+            <ul class="pager center-block">
+                <li class="previous"><a href="#">« 上一页</a></li>
+                <li><a href="#">1</a></li>
+                <li class="active"><a href="#">2</a></li>
+                <li><a href="#">3</a></li>
+                <li><a href="#">4</a></li>
+                <li><a href="#">5</a></li>
+                <li class="next"><a href="#">下一页 »</a></li>
+            </ul>
+        </div>
+
+</div>
+<!--  end -->
 
-    <link rel="import" href="/view/common/foot.html?__inline">
-</body>
 
 <script type="text/javascript">
      $(document).ready(function() {

VisualInspection/view/assess_management/assess_item.html

@@ -1,86 +1,39 @@
-<!doctype html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">    
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
-
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
-
-        <!--考核项 s-->
-        <div id="main" class="container-fluid main">
-            <div class="row">
-                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                    <div id="mum_left" class="mum_left">
-                        <link rel="import" href="/view/mum.html?__inline">
-                    </div>
-                </div>
-                <div class="col-md-10">
-                    <div id="mum_right" class="mum_right">
-
-                        <div class="panel">
-                            <div class="panel-heading">
-                                <ol class="breadcrumb" style="margin-bottom: 0;">
-                                    <li><a href="your/url/">考核办法管理</a></li>
-                                    <li class="active">考核项</li>
-                                </ol>
-                            </div>
-                            <div class="panel-body" id="main_content">
-                                <!-- 考核办法 start -->
-                                <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-xs-3">
-                                                <div class="input-group">
-                                                    <span class="input-group-addon">关键词</span>
-                                                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
-                                                </div>
-                                            </div>
-                                            
-                                            <div class="col-xs-3">
-                                                <div class="input-group">
-                                                    <button class="btn btn-primary " type="button">查询</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <hr>
-                                        <div class="row">
-                                            <div class="col-sm-12" style="text-align:center;">
-                                                <span style="font-size:18px;">收费站收费员视频考核管理办法</span>
-                                            </div>
-                                        </div>
-                                        <hr>
-                                        <div class="row">
-                                            <div class="col-sm-offset-3 col-sm-3">
-                                                 <ul class="tree tree-lines" id="myTree">
-                                                    ...
-                                                </ul>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-sm-1 col-sm-offset-5">
-                                                <button type="submit" class="btn btn-info">保存</button>
-                                            </div>
-                                            <div class="col-sm-1">
-                                                <button type="submit" class="btn btn-info">取消</button>
-                                            </div>
-                                        </div>
-                                </div>
-                                <!-- 考核办法  end -->          
-                            </div>
-                        </div>
-                    </div>
-                </div>
+<div class="container-fluid ">
+    <div class="row">
+        <div class="col-xs-3">
+            <div class="input-group">
+                <span class="input-group-addon">关键词</span>
+                <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
             </div>
         </div>
-        <!--考核项 e-->
-
-    <link rel="import" href="/view/common/foot.html?__inline">
-    <script src="/js/assess_management/assess_item.js"></script>
-</body>
-
-</html>
+        
+        <div class="col-xs-3">
+            <div class="input-group">
+                <button class="btn btn-primary " type="button">查询</button>
+            </div>
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+        <div class="col-sm-12" style="text-align:center;">
+            <span style="font-size:18px;">收费站收费员视频考核管理办法</span>
+        </div>
+    </div>
+    <hr>
+    <div class="row">
+        <div class="col-sm-offset-3 col-sm-3">
+                <ul class="tree tree-lines" id="myTree">
+                ...
+            </ul>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-sm-1 col-sm-offset-5">
+            <button type="submit" class="btn btn-info">保存</button>
+        </div>
+        <div class="col-sm-1">
+            <button type="submit" class="btn btn-info">取消</button>
+        </div>
+    </div>
+</div>
+<script src="/js/assess_management/assess_item.js"></script>

VisualInspection/view/assess_management/assess_way.html

@@ -1,140 +1,110 @@
-<!doctype html>
-<html>
 
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">    
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
+<!-- 考核办法 start -->
+        <div class="container-fluid ">
+            <div class="row">
+                <form  class="form-horizontal">
+                <div class="form-group">
+                    <!--<div class="col-xs-3">
+                        <div class="input-group">
+                            <span class="input-group-addon">选择分类</span>
+                            <input class="form-control form-focus" autofocus type="text" placeholder="请输入选择分类">
+                        </div>
+                    </div>
+                    <div class="col-xs-3">
+                        <div class="input-group">
+                            <span class="input-group-addon">关键词</span>
+                            <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
+                        </div>
+                    </div>-->
+                    
+                    <label for="exampleInputAccount1" class="col-sm-1">选择分类</label>
+                    <div class="col-sm-2">
+                        <select class="form-control">
+                            <option value="">全部</option>
+                        </select>
+                    </div>
 
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
+                    <label for="exampleInputAccount1" class="col-sm-1">关键词</label>
+                    <div class="col-sm-2">
+                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
+                    </div>
 
+                    <div class="col-xs-3">
+                        <div class="input-group">
+                            <button class="btn btn-primary " type="button">查询</button>
+                        </div>
+                    </div>
+                    <div style="float:right;margin-right:30px;">
+                        <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 添加考核办法</button>
+                    </div>
+             </div>
+            </form>
+            </div>
+            <br>
 
-    <div id="main" class="container-fluid main">
-        <div class="row">
-            <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                <div id="mum_left" class="mum_left">
-                    <link rel="import" href="/view/mum.html?__inline">
+            <div class="row">
+                <!-- 使用一个div来显示数据表格 -->
+                <div class="datatable" data-checkable="true" data-sortable="true"></div>
+            </div>
+            <div class="row" style="text-align:center">
+                <ul class="pager center-block">
+                    <li class="previous"><a href="#">« 上一页</a></li>
+                    <li><a href="#">1</a></li>
+                    <li class="active"><a href="#">2</a></li>
+                    <li><a href="#">3</a></li>
+                    <li><a href="#">4</a></li>
+                    <li><a href="#">5</a></li>
+                    <li class="next"><a href="#">下一页 »</a></li>
+                </ul>
+            </div>
+        </div>
+        <!-- 对话框HTML -->
+        <div class="modal fade" id="myModal">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    
                 </div>
+                <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title">添加考核办法</h4>
             </div>
-            <div class="col-md-10">
-                <div id="mum_right" class="mum_right">
-
-                    <div class="panel">
-                        <div class="panel-heading">
-                            <ol class="breadcrumb" style="margin-bottom: 0;">
-                                <li class="active">考核办法管理</li>
-                            </ol>
-                        </div>
-                        <div class="panel-body" id="main_content">
-                            <!-- 考核办法 start -->
-                                    <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-xs-3">
-                                                <div class="input-group">
-                                                    <span class="input-group-addon">选择分类</span>
-                                                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入选择分类">
-                                                </div>
-                                            </div>
-                                            <div class="col-xs-3">
-                                                <div class="input-group">
-                                                    <span class="input-group-addon">关键词</span>
-                                                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
-                                                </div>
-                                            </div>
-                                            
-                                            <div class="col-xs-3">
-                                                <div class="input-group">
-                                                    <button class="btn btn-primary " type="button">查询</button>
-                                                </div>
-                                            </div>
-                                            <div style="float:right;">
-                                                <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 添加</button>
-                                            </div>
-                                        </div>
-                                        <br>
-
-                                        <div class="row">
-                                            <!-- 使用一个div来显示数据表格 -->
-                                            <div class="datatable" data-checkable="true" data-sortable="true"></div>
-                                        </div>
-                                        <div class="row" style="text-align:center">
-                                            <ul class="pager center-block">
-                                                <li class="previous"><a href="#">« 上一页</a></li>
-                                                <li><a href="#">1</a></li>
-                                                <li class="active"><a href="#">2</a></li>
-                                                <li><a href="#">3</a></li>
-                                                <li><a href="#">4</a></li>
-                                                <li><a href="#">5</a></li>
-                                                <li class="next"><a href="#">下一页 »</a></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                    <!-- 对话框HTML -->
-                                    <div class="modal fade" id="myModal">
-                                        <div class="modal-dialog">
-                                            <div class="modal-content">
-                                                
-                                            </div>
-                                            <div class="modal-content">
-                                        <div class="modal-header">
-                                            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                                            <h4 class="modal-title">添加考核办法</h4>
-                                        </div>
-                                        <div class="modal-body">
-                                               <!-- 添加对话框 -->
-                                                <div class="container-fluid ">
-                                                    <form class="form-horizontal">
-                                                        <div class="form-group">
-                                                            <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核办法</label>
-                                                            <div class="col-md-6 col-sm-8">
-                                                            <input type="text" class="form-control" id="flag_name" placeholder="考核办法">
-                                                            </div>
-                                                        </div>
-                                                        <div class="form-group">
-                                                            <label for="exampleInputPassword4" class="col-sm-offset-1 col-sm-2">考核对象</label>
-                                                            <div class="col-md-3 col-sm-4">
-                                                                <select type="text" class="form-control" >
-                                                                    <option>请选择</option>
-                                                                </select>
-                                                            </div>
-                                                             <div class="col-md-3 col-sm-4">
-                                                                <select type="text" class="form-control" >
-                                                                    <option>请选择</option>
-                                                                </select>
-                                                            </div>
-                                                        </div>
-                                                      
-                                                        <div class="form-group">
-                                                            <div class="col-sm-offset-3 col-sm-8">
-                                                            <button type="submit" class="btn btn-info">保存</button>
-                                                            </div>
-                                                        </div>
-                                                        </form>
-                                                </div>
-                                               <!--添加对话框结束-->
-                                        </div>
-                                        </div>
-                                    </div>
+            <div class="modal-body">
+                    <!-- 添加对话框 -->
+                    <div class="container-fluid ">
+                        <form class="form-horizontal">
+                            <div class="form-group">
+                                <label for="exampleInputAccount4" class="col-sm-offset-1 col-sm-2">考核办法</label>
+                                <div class="col-md-6 col-sm-8">
+                                <input type="text" class="form-control" id="flag_name" placeholder="考核办法">
                                 </div>
-                            <!-- 考核办法  end -->          
-                        </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="exampleInputPassword4" class="col-sm-offset-1 col-sm-2">考核对象</label>
+                                <div class="col-md-3 col-sm-4">
+                                    <select type="text" class="form-control" >
+                                        <option>请选择</option>
+                                    </select>
+                                </div>
+                                    <div class="col-md-3 col-sm-4">
+                                    <select type="text" class="form-control" >
+                                        <option>请选择</option>
+                                    </select>
+                                </div>
+                            </div>
+                            
+                            <div class="form-group">
+                                <div class="col-sm-offset-3 col-sm-8">
+                                <button type="submit" class="btn btn-info">保存</button>
+                                </div>
+                            </div>
+                            </form>
                     </div>
-
-                </div>
-
+                    <!--添加对话框结束-->
+            </div>
             </div>
-
         </div>
     </div>
+<!-- 考核办法  end -->    
 
-    <link rel="import" href="/view/common/foot.html?__inline">
-    <!--<script src="/js/main.js"></script>-->
-    <script src="/js/assess_management/assess_way.js?_inline"></script>
-</body>
-
-
-</html>
+<script src="/js/assess_management/assess_way.js?_inline"></script>

VisualInspection/view/term_management/charge_stuff_schedule.html

@@ -1,36 +1,4 @@
-<!doctype html>
-<html>
 
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">
-    <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">  
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
-
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
-
-        <!-- s-->
-        <div id="main" class="container-fluid main">
-            <div class="row">
-                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                    <div id="mum_left" class="mum_left">
-                        <link rel="import" href="/view/mum.html?__inline">
-                    </div>
-                </div>
-                <div class="col-md-10">
-                    <div id="mum_right" class="mum_right">
-
-                        <div class="panel">
-                            <div class="panel-heading">
-                                <ol class="breadcrumb" style="margin-bottom: 0;">
-                                    <li class="active">收费人员排班</li>
-                                </ol>
-                            </div>
-                            <div class="panel-body" id="main_content">
                                 <!--  start -->
                                 <div class="container-fluid ">
                                         <div class="row">
@@ -40,11 +8,7 @@
                                         </div>
                                 </div>
                                 <!--   end -->          
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+          
             <!--对话框 开始-->
             <div class="modal fade" id="myModal">
                     <div class="modal-dialog">
@@ -112,9 +76,10 @@
             <!--对话框 结束-->
         </div>
         <!-- e-->
-    <link rel="import" href="/view/common/foot.html?__inline">
+
     <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
-</body>
+    <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css"> 
+
 <style type="text/css" >
     span.time{
         display: none !important ;
@@ -163,5 +128,3 @@
    })
 
 </script>
-
-</html>

VisualInspection/view/term_management/charge_terms_m.html

@@ -1,79 +1,47 @@
-<!doctype html>
-<html>
 
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">    
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
-
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
-
-        <!-- s-->
-        <div id="main" class="container-fluid main">
-            <div class="row">
-                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                    <div id="mum_left" class="mum_left">
-                        <link rel="import" href="/view/mum.html?__inline">
+<!--  start -->
+<div class="container-fluid ">
+        <div class="row">
+             <form  class="form-horizontal">
+                <div class="form-group">
+                    <label for="exampleInputAccount1" class="col-sm-1">关键词</label>
+                    <div class="col-sm-2">
+                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
                     </div>
-                </div>
-                <div class="col-md-10">
-                    <div id="mum_right" class="mum_right">
 
-                        <div class="panel">
-                            <div class="panel-heading">
-                                <ol class="breadcrumb" style="margin-bottom: 0;">
-                                    <li class="active">稽查人员班组列表</li>
-                                </ol>
-                            </div>
-                            <div class="panel-body" id="main_content">
-                                <!--  start -->
-                                <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-sm-3">
-                                                <div class="input-group">
-                                                    <span class="input-group-addon">关键词</span>
-                                                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
-                                                </div>
-                                            </div>
-                                            
-                                            <div class="col-sm-9">
-                                                <button class="btn btn-primary " type="button">查询</button>
-                                                <button class="btn btn-info" style="float:right;" type="button"><i class="icon icon-plus-sign"></i>添加班组</button>
-                                            </div>
-                                        </div>
-                                        <hr>
-                                        <div class="row">
-                                            <!-- 使用一个div来显示数据表格 -->
-                                            <div class="datatable" data-checkable="true" data-sortable="true"></div>
-                                        </div>
-                                        <div class="row" style="text-align:center">
-                                            <ul class="pager center-block">
-                                                <li class="previous"><a href="#">« 上一页</a></li>
-                                                <li><a href="#">1</a></li>
-                                                <li class="active"><a href="#">2</a></li>
-                                                <li><a href="#">3</a></li>
-                                                <li><a href="#">4</a></li>
-                                                <li><a href="#">5</a></li>
-                                                <li class="next"><a href="#">下一页 »</a></li>
-                                            </ul>
-                                        </div>
-
-                                </div>
-                                <!--  end -->          
-                            </div>
+                    <div class="col-xs-3">
+                        <div class="input-group">
+                            <button class="btn btn-primary " type="button">查询</button>
                         </div>
                     </div>
+
+                     <div style="float:right;margin-right:30px;">
+                        <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 增加班组</button>
+                    </div>
+
                 </div>
-            </div>
+             </form>
+        </div>
+        <hr>
+        <div class="row">
+            <!-- 使用一个div来显示数据表格 -->
+            <div class="datatable" data-checkable="true" data-sortable="true"></div>
+        </div>
+        <div class="row" style="text-align:center">
+            <ul class="pager center-block">
+                <li class="previous"><a href="#">« 上一页</a></li>
+                <li><a href="#">1</a></li>
+                <li class="active"><a href="#">2</a></li>
+                <li><a href="#">3</a></li>
+                <li><a href="#">4</a></li>
+                <li><a href="#">5</a></li>
+                <li class="next"><a href="#">下一页 »</a></li>
+            </ul>
         </div>
-        <!-- e-->
 
-    <link rel="import" href="/view/common/foot.html?__inline">
-</body>
+</div>
+<!--  end -->          
+
 
 <script type="text/javascript">
      $(document).ready(function() {
@@ -93,16 +61,14 @@
                     {width: 80, text: '操作', type: 'string', flex: true, colClass: ''},
                 ],
                 rows: [
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
                 ]
             }
         });
     })
-</script>
-
-</html>
+</script>

VisualInspection/view/term_management/check_stuff_schedule.html

@@ -1,50 +1,14 @@
-<!doctype html>
-<html>
 
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">
-    <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">  
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
-
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
-
-        <!-- s-->
-        <div id="main" class="container-fluid main">
-            <div class="row">
-                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                    <div id="mum_left" class="mum_left">
-                        <link rel="import" href="/view/mum.html?__inline">
-                    </div>
-                </div>
-                <div class="col-md-10">
-                    <div id="mum_right" class="mum_right">
-
-                        <div class="panel">
-                            <div class="panel-heading">
-                                <ol class="breadcrumb" style="margin-bottom: 0;">
-                                    <li class="active">稽查人员排班</li>
-                                </ol>
-                            </div>
-                            <div class="panel-body" id="main_content">
-                                <!--  start -->
-                                <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                               <div id="calendar" class="calendar"></div>
-                                            </div>
-                                        </div>
-                                </div>
-                                <!--   end -->          
-                            </div>
+    
+             <!--  start -->
+            <div class="container-fluid ">
+                    <div class="row">
+                        <div class="col-sm-12">
+                            <div id="calendar" class="calendar"></div>
                         </div>
                     </div>
-                </div>
             </div>
+           <!--   end -->         
             <!--对话框 开始-->
             <div class="modal fade" id="myModal">
                     <div class="modal-dialog">
@@ -110,11 +74,9 @@
                 </div>
             </div>
             <!--对话框 结束-->
-        </div>
-        <!-- e-->
-    <link rel="import" href="/view/common/foot.html?__inline">
-    <script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
-</body>
+  <link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/calendar/zui.calendar.css">   
+<script src="/node_modules/zui/dist/lib/calendar/zui.calendar.js"></script>
+
 <style type="text/css" >
     span.time{
         display: none !important ;
@@ -163,5 +125,3 @@
    })
 
 </script>
-
-</html>

VisualInspection/view/term_management/check_terms_m.html

@@ -1,79 +1,47 @@
-<!doctype html>
-<html>
 
-<head>
-    <meta charset="utf-8">
-    <title>稽查</title>
-    <link rel="import" href="/view/common/commoncsslink.html?__inline">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">    
-    <link rel="import" href="/view/common/commonscriptlink.html?__inline">
-</head>
-
-<body>
-    <link rel="import" href="/view/common/head.html?__inline">
-
-        <!-- s-->
-        <div id="main" class="container-fluid main">
-            <div class="row">
-                <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
-                    <div id="mum_left" class="mum_left">
-                        <link rel="import" href="/view/mum.html?__inline">
+<!--  start -->
+<div class="container-fluid ">
+        <div class="row">
+             <form  class="form-horizontal">
+                <div class="form-group">
+                    <label for="exampleInputAccount1" class="col-sm-1">关键词</label>
+                    <div class="col-sm-2">
+                        <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
                     </div>
-                </div>
-                <div class="col-md-10">
-                    <div id="mum_right" class="mum_right">
 
-                        <div class="panel">
-                            <div class="panel-heading">
-                                <ol class="breadcrumb" style="margin-bottom: 0;">
-                                    <li class="active">收费人员班组列表</li>
-                                </ol>
-                            </div>
-                            <div class="panel-body" id="main_content">
-                                <!--  start -->
-                                <div class="container-fluid ">
-                                        <div class="row">
-                                            <div class="col-sm-3">
-                                                <div class="input-group">
-                                                    <span class="input-group-addon">关键词</span>
-                                                    <input class="form-control form-focus" autofocus type="text" placeholder="请输入关键词">
-                                                </div>
-                                            </div>
-                                            
-                                            <div class="col-sm-9">
-                                                <button class="btn btn-primary " type="button">查询</button>
-                                                <button class="btn btn-info" style="float:right;" type="button"><i class="icon icon-plus-sign"></i>添加班组</button>
-                                            </div>
-                                        </div>
-                                        <hr>
-                                        <div class="row">
-                                            <!-- 使用一个div来显示数据表格 -->
-                                            <div class="datatable" data-checkable="true" data-sortable="true"></div>
-                                        </div>
-                                        <div class="row" style="text-align:center">
-                                            <ul class="pager center-block">
-                                                <li class="previous"><a href="#">« 上一页</a></li>
-                                                <li><a href="#">1</a></li>
-                                                <li class="active"><a href="#">2</a></li>
-                                                <li><a href="#">3</a></li>
-                                                <li><a href="#">4</a></li>
-                                                <li><a href="#">5</a></li>
-                                                <li class="next"><a href="#">下一页 »</a></li>
-                                            </ul>
-                                        </div>
-
-                                </div>
-                                <!--  end -->          
-                            </div>
+                    <div class="col-xs-3">
+                        <div class="input-group">
+                            <button class="btn btn-primary " type="button">查询</button>
                         </div>
                     </div>
+
+                     <div style="float:right;margin-right:30px;">
+                        <button class="btn btn-primary" type="button" data-toggle="modal" data-target="#myModal"><i class="icon icon-plus-sign"></i> 增加班组</button>
+                    </div>
+
                 </div>
-            </div>
+             </form>
+        </div>
+        <hr>
+        <div class="row">
+            <!-- 使用一个div来显示数据表格 -->
+            <div class="datatable" data-checkable="true" data-sortable="true"></div>
+        </div>
+        <div class="row" style="text-align:center">
+            <ul class="pager center-block">
+                <li class="previous"><a href="#">« 上一页</a></li>
+                <li><a href="#">1</a></li>
+                <li class="active"><a href="#">2</a></li>
+                <li><a href="#">3</a></li>
+                <li><a href="#">4</a></li>
+                <li><a href="#">5</a></li>
+                <li class="next"><a href="#">下一页 »</a></li>
+            </ul>
         </div>
-        <!-- e-->
 
-    <link rel="import" href="/view/common/foot.html?__inline">
-</body>
+</div>
+<!--  end -->          
+
 
 <script type="text/javascript">
      $(document).ready(function() {
@@ -93,16 +61,14 @@
                     {width: 80, text: '操作', type: 'string', flex: true, colClass: ''},
                 ],
                 rows: [
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-                    {checked: false, data: [1, '收费一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
+                    {checked: false, data: [1, '考核一组','稽查人员','李明','李铭','王佳佳、李伟、李浩','<a href="#"><i class="icon icon-edit"></i> 修改</a> <a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
                 ]
             }
         });
     })
 </script>
-
-</html>

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/User.java

@@ -22,14 +22,15 @@ public class User implements UserDetails {
 	// 姓名
 	private String truename;
 	// 密码
+	 @JsonIgnore
 	private String password;
 	// 组织机构ID
-	private int organid;
+	private Integer organid;
 	// 班次
-	private int classid;
+	private Integer classid;
 	
 	// 班组
-	private int teamid;
+	private Integer teamid;
 	// 电话号码
 	private String phone;
 	// 状态（-1-删除;1未删除）
@@ -61,13 +62,13 @@ public class User implements UserDetails {
 	// 生日
 	private Date birth;
 	// 年龄
-	private int age;
+	private Integer age;
 	// 职位ID
-	private int positionid;
+	private Integer positionid;
 	// 性别
 	private String sex;
 	// 工号
-	private int workno;
+	private Integer workno;
 	// 身份证号
 	private String idno;
 	
@@ -134,7 +135,7 @@ public class User implements UserDetails {
     }
 
 	// 返回分配给用户的角色列表
-	@JsonIgnore
+	
 	@Override
 	public Collection<? extends GrantedAuthority> getAuthorities() {
 		return authorities;

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/UserController.java

@@ -75,7 +75,6 @@ public class UserController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/addUser",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
     public String addUser(@RequestBody User user) throws Exception{
     	user.setPassword(new Md5PasswordEncoder().encodePassword(user.getPassword(), null));
@@ -108,7 +107,6 @@ public class UserController extends BaseController {
      * @exception
      * @since  1.0.0
      */
-    @PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/deleteUser/{userid}",method=RequestMethod.DELETE,produces="application/json;charset=UTF-8")
     public String deleteUser(@PathVariable Integer userid){
         try{
@@ -125,8 +123,6 @@ public class UserController extends BaseController {
      * @param size
      * @return
      */
-    @SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ADMIN')")
     @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
     public String getallUsers(@PathVariable Integer page,@PathVariable Integer size ){
         try{
@@ -139,14 +135,12 @@ public class UserController extends BaseController {
         }
     }
     
-    @PreAuthorize("hasRole('ADMIN')")
-    @RequestMapping(value = "/getUserList/{page}/{size}",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
-    public String getUsers(@PathVariable Integer page,@PathVariable Integer size,@RequestBody User user){
+    @RequestMapping(value = "/getUserList",method=RequestMethod.POST,produces="application/json;charset=UTF-8")
+    public String getUsers(@RequestBody User user){
         try{
-        	PageHelper.startPage(page, size); 
         	List<User> users= userService.getUsers(user);
         	
-        	return returnResult(0, "获取成功", new PageInfo(users));
+        	return returnResult(0, "获取成功", users);
         }catch(Exception e){
         	throw new BusinessException(20001);
         }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -17,13 +17,13 @@
 
     <select id="getAll" resultMap="BaseResultMap"  >
         SELECT
-        id,username,password
+        *
         FROM t_sys_users
     </select>
 
     <select id="getOne" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
         SELECT
-        id,username,age,password
+        *
         FROM t_sys_users
         WHERE id = #{id}
     </select>
@@ -67,7 +67,7 @@
     
     <select id="getUsers" parameterType="com.xintong.visualinspection.bean.User" resultMap="BaseResultMap"  >
         SELECT
-        id,username,password
+        *
         FROM t_sys_users
         where 1=1
         <if test="organid != null and organid != 0">and organid = #{organid} </if>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/UserServiceImpl.java

@@ -58,7 +58,26 @@ public class UserServiceImpl extends BaseService implements UserService {
     
 	@Override
 	public List<User> getUsers(User user) {
-		return userInfoDao.getUsers(user);
+		//获取权限
+		
+		List<User> users= userInfoDao.getUsers(user);
+		if(users!=null && users.size()>0){
+			for(User u : users){
+				List<Permission> permissions = permissionDao.findByAdminUserId(u.getId());
+	            List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
+	            for (Permission permission : permissions) {
+	                if (permission != null && permission.getName() != null) {
+	                    GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(permission.getName());
+	                    grantedAuthorities.add(grantedAuthority);
+	                }
+	            }
+	            u.setGrantedAuthorities(grantedAuthorities);
+			}
+		}
+		return users;
+		
+		
+		
 	}