Skip to content

G
guns-vip
Commit 03f98bc5 by Swifly Committed by stylefeng
Options

Merge pull request !6 from Swifly/master

parents c0514f8a 96768ec9
Showing with 90 additions and 38 deletions
src/main/java/com/stylefeng/guns/modular/system/controller/UserMgrController.java
...@@ -159,8 +159,8 @@ public class UserMgrController extends BaseController { ...@@ -159,8 +159,8 @@ public class UserMgrController extends BaseController {
@RequestMapping("/list") @RequestMapping("/list")
@Permission @Permission
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime) { public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer deptid) {
List<Map<String, Object>> users = managerDao.selectUsers(name, beginTime, endTime); List<Map<String, Object>> users = managerDao.selectUsers(name, beginTime, endTime, deptid);
return new UserWarpper(users).warp(); return new UserWarpper(users).warp();
} }
......
src/main/java/com/stylefeng/guns/modular/system/dao/UserMgrDao.java
...@@ -38,7 +38,7 @@ public interface UserMgrDao { ...@@ -38,7 +38,7 @@ public interface UserMgrDao {
* @return * @return
* @date 2017年2月12日 下午9:14:34 * @date 2017年2月12日 下午9:14:34
*/ */
List<Map<String, Object>> selectUsers(@Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime); List<Map<String, Object>> selectUsers(@Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Integer deptid);
/** /**
* 设置用户的角色 * 设置用户的角色
......
src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMgrDao.xml
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
or account like CONCAT('%',#{name},'%') or account like CONCAT('%',#{name},'%')
or name like CONCAT('%',#{name},'%')) or name like CONCAT('%',#{name},'%'))
</if> </if>
<if test="deptid != null and deptid != 0">
and deptid = #{deptid}
</if>
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''"> <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and (createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59')) and (createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if> </if>
......
src/main/webapp/WEB-INF/view/system/dict/dict.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<h5>部门管理</h5> <h5>字典管理</h5>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="row row-lg"> <div class="row row-lg">
......
src/main/webapp/WEB-INF/view/system/user/user.html
...@@ -10,42 +10,69 @@ ...@@ -10,42 +10,69 @@
<div class="col-sm-12"> <div class="col-sm-12">
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-3">
<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/> <div class="panel panel-default">
<div class="panel-heading">组织机构</div>
<div class="panel-body dept-tree">
<ul id="treeDemo" class="ztree"></ul>
</div>
</div>
</div> </div>
<div class="col-sm-3"> <div class="col-sm-9">
<#TimeCon id="beginTime" name="注册开始日期" isTime="false" pattern="YYYY-MM-DD"/> <div class="row">
</div> <div class="col-sm-10">
<div class="col-sm-3"> <div class="row">
<#TimeCon id="endTime" name="注册结束日期" isTime="false" pattern="YYYY-MM-DD"/> <div class="col-sm-12">
<#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<#TimeCon id="beginTime" name="注册开始日期" isTime="false" pattern="YYYY-MM-DD"/>
</div>
<div class="col-sm-6">
<#TimeCon id="endTime" name="注册结束日期" isTime="false" pattern="YYYY-MM-DD"/>
</div>
</div>
</div>
<div class="col-sm-2">
<div class="row">
<div class="col-sm-12">
<#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()"/>
</div>
</div>
</div>
</div>
<div class="hidden-xs" id="managerTableToolbar" role="group">
@if(shiro.hasPermission("/mgr/add")){
<#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
@}
@if(shiro.hasPermission("/mgr/edit")){
<#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/delete")){
<#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/reset")){
<#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/freeze")){
<#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/unfreeze")){
<#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/setRole")){
<#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
@}
</div>
<#table id="managerTable"/>
</div> </div>
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
</div>
</div>
<div class="hidden-xs" id="managerTableToolbar" role="group">
@if(shiro.hasPermission("/mgr/add")){
<#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
@}
@if(shiro.hasPermission("/mgr/edit")){
<#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/delete")){
<#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/reset")){
<#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/freeze")){
<#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/unfreeze")){
<#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
@}
@if(shiro.hasPermission("/mgr/setRole")){
<#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
@}
</div> </div>
<#table id="managerTable"/>
</div> </div>
</div> </div>
</div> </div>
......
src/main/webapp/static/css/_fstyle.css
...@@ -51,4 +51,7 @@ ...@@ -51,4 +51,7 @@
width: 224px !important; width: 224px !important;
max-height: 160px !important; max-height: 160px !important;
-moz-user-select: none !important; -moz-user-select: none !important;
}
.dept-tree {
padding:10px
} }
\ No newline at end of file
src/main/webapp/static/modular/system/user/user.js
...@@ -5,7 +5,8 @@ var MgrUser = { ...@@ -5,7 +5,8 @@ var MgrUser = {
id: "managerTable",//表格id id: "managerTable",//表格id
seItem: null, //选中的条目 seItem: null, //选中的条目
table: null, table: null,
layerIndex: -1 layerIndex: -1,
deptid:0
}; };
/** /**
...@@ -166,9 +167,18 @@ MgrUser.resetPwd = function () { ...@@ -166,9 +167,18 @@ MgrUser.resetPwd = function () {
} }
}; };
MgrUser.resetSearch = function () {
$("#name").val("");
$("#beginTime").val("");
$("#endTime").val("");
MgrUser.search();
}
MgrUser.search = function () { MgrUser.search = function () {
var queryData = {}; var queryData = {};
queryData['deptid'] = MgrUser.deptid;
queryData['name'] = $("#name").val(); queryData['name'] = $("#name").val();
queryData['beginTime'] = $("#beginTime").val(); queryData['beginTime'] = $("#beginTime").val();
queryData['endTime'] = $("#endTime").val(); queryData['endTime'] = $("#endTime").val();
...@@ -176,9 +186,17 @@ MgrUser.search = function () { ...@@ -176,9 +186,17 @@ MgrUser.search = function () {
MgrUser.table.refresh({query: queryData}); MgrUser.table.refresh({query: queryData});
} }
MgrUser.onClickDept = function (e, treeId, treeNode) {
MgrUser.deptid = treeNode.id;
MgrUser.search();
};
$(function () { $(function () {
var defaultColunms = MgrUser.initColumn(); var defaultColunms = MgrUser.initColumn();
var table = new BSTable("managerTable", "/mgr/list", defaultColunms); var table = new BSTable("managerTable", "/mgr/list", defaultColunms);
table.setPaginationType("client"); table.setPaginationType("client");
MgrUser.table = table.init(); MgrUser.table = table.init();
var ztree = new $ZTree("treeDemo", "/dept/tree");
ztree.bindOnClick(MgrUser.onClickDept);
ztree.init();
}); });
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment