Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
46936c01
Commit
46936c01
authored
Apr 18, 2017
by
fsn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
角色管理条件查询完善
parent
4b379e1d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
+2
-2
src/main/webapp/WEB-INF/view/system/role/role.html
+1
-1
src/main/webapp/static/modular/system/role/role.js
+9
-0
No files found.
src/main/java/com/stylefeng/guns/modular/system/controller/RoleController.java
View file @
46936c01
...
@@ -106,8 +106,8 @@ public class RoleController extends BaseController {
...
@@ -106,8 +106,8 @@ public class RoleController extends BaseController {
*/
*/
@RequestMapping
(
value
=
"/list"
)
@RequestMapping
(
value
=
"/list"
)
@ResponseBody
@ResponseBody
public
Object
list
()
{
public
Object
list
(
@RequestParam
(
required
=
false
)
String
roleName
)
{
List
<
Map
<
String
,
Object
>>
roles
=
this
.
roleDao
.
selectRoles
(
super
.
getPara
(
"
condition
"
));
List
<
Map
<
String
,
Object
>>
roles
=
this
.
roleDao
.
selectRoles
(
super
.
getPara
(
"
roleName
"
));
return
super
.
warpObject
(
new
RoleWarpper
(
roles
));
return
super
.
warpObject
(
new
RoleWarpper
(
roles
));
}
}
...
...
src/main/webapp/WEB-INF/view/system/role/role.html
View file @
46936c01
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
<
#
NameCon
id=
"roleName"
name=
"角色名称"
/>
<
#
NameCon
id=
"roleName"
name=
"角色名称"
/>
</div>
</div>
<div
class=
"col-sm-3"
>
<div
class=
"col-sm-3"
>
<
#
button
name=
"搜索"
icon=
"fa-search"
clickFun=
"search()"
/>
<
#
button
name=
"搜索"
icon=
"fa-search"
clickFun=
"
Role.
search()"
/>
</div>
</div>
</div>
</div>
<div
class=
"hidden-xs"
id=
"roleTableToolbar"
role=
"group"
>
<div
class=
"hidden-xs"
id=
"roleTableToolbar"
role=
"group"
>
...
...
src/main/webapp/static/modular/system/role/role.js
View file @
46936c01
...
@@ -107,6 +107,15 @@ Role.assign = function(){
...
@@ -107,6 +107,15 @@ Role.assign = function(){
}
}
};
};
/**
* 搜索角色
*/
Role
.
search
=
function
(){
var
queryData
=
{};
queryData
[
'roleName'
]
=
$
(
"#roleName"
).
val
();
Role
.
table
.
refresh
({
query
:
queryData
});
}
$
(
function
(){
$
(
function
(){
var
defaultColunms
=
Role
.
initColumn
();
var
defaultColunms
=
Role
.
initColumn
();
var
table
=
new
BSTable
(
Role
.
id
,
"/role/list"
,
defaultColunms
);
var
table
=
new
BSTable
(
Role
.
id
,
"/role/list"
,
defaultColunms
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment