Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-shiro
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
xzxt-shiro
Commits
963d85a2
Commit
963d85a2
authored
Aug 15, 2018
by
chang_chao@founder.com.cn
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
fe6d53a8
1ab56eb3
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
+3
-2
src/main/webapp/WEB-INF/jsp/admin/permission/list.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
+2
-0
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
+2
-0
No files found.
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
View file @
963d85a2
...
...
@@ -478,7 +478,7 @@
ID, NAME, MENUNAME, PID, PERMISSION, URL, DESCRIPTION, TYPE
FROM
sys_permission_new
where scbz = 0 AND flag=1
/*生成菜单*/
where scbz = 0 AND flag=1
AND id like 'H01%' ORDER BY ID
</select>
<!--根据userid查询菜单-->
<select
id=
"selectMencusByUserId"
resultType=
"com.xzxtshiro.pojo.SysPermissionNew"
>
...
...
@@ -487,8 +487,9 @@
ID, NAME, MENUNAME, PID, PERMISSION, URL, TYPE
FROM
VW_USER_PERMISSION
where flag=1
/*生成菜单*/
where flag=1
<if
test=
"userId!=null"
>
and USERID=#{userId,jdbcType=VARCHAR}
</if>
AND id like 'H01%' ORDER BY ID
</select>
<!--查询用户列表-->
<select
id=
"selectSysUserByCondition"
resultMap=
"BaseResultMap"
>
...
...
src/main/webapp/WEB-INF/jsp/admin/permission/list.jsp
View file @
963d85a2
...
...
@@ -40,7 +40,7 @@
<th
lay-data=
"{field:'rn',align:'center', width:60, sort: true}"
>
序号
</th>
<th
lay-data=
"{field:'id',align:'center', width:100}"
>
权限ID
</th>
<th
lay-data=
"{field:'name',align:'center', width:150, sort: true}"
>
权限名称
</th>
<
th
lay-data=
"{field:'permission', align:'center',width:150, sort: true}"
>
权限代码
</th
>
<
%
--
<
th
lay-data=
"{field:'permission', align:'center',width:150, sort: true}"
>
权限代码
</th>
--%
>
<th
lay-data=
"{field:'url', align:'center',width:200, sort: true}"
>
权限URL
</th>
<th
lay-data=
"{field:'pid', align:'center',width:100, sort: true}"
>
父级权限ID
</th>
<th
lay-data=
"{width:200, align:'center', toolbar: '#toolBar'}"
>
操作
</th>
...
...
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
View file @
963d85a2
...
...
@@ -287,7 +287,9 @@
//出生日期转化
var
birthday
=
"${user.birthday}"
;
if
(
birthday
!=
""
){
$
(
"#birthday"
).
val
(
formatTime
(
birthday
));
}
form
.
render
();
...
...
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
View file @
963d85a2
...
...
@@ -287,7 +287,9 @@
//出生日期转化
var
birthday
=
"${user.birthday}"
;
if
(
birthday
!=
""
){
$
(
"#birthday"
).
val
(
formatTime
(
birthday
));
}
form
.
render
();
var
data
=
$
{
unit
};
...
...
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