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
a7934349
Commit
a7934349
authored
Sep 18, 2018
by
zhaoshaonan
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/dev' into dev_zz
parents
e6ca46a2
3b016ccf
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
132 additions
and
28 deletions
+132
-28
.gitignore
+85
-0
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
+1
-0
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
+2
-2
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
+24
-6
src/main/webapp/WEB-INF/jsp/admin/permission/add.jsp
+2
-2
src/main/webapp/WEB-INF/jsp/admin/role/add.jsp
+3
-3
src/main/webapp/WEB-INF/jsp/admin/role/update.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
+3
-3
src/main/webapp/WEB-INF/jsp/admin/user/batchUpdate.jsp
+1
-6
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
+3
-3
src/main/webapp/resources/common/common.js
+7
-2
No files found.
.gitignore
0 → 100644
View file @
a7934349
# Created by .ignore support plugin (hsz.mobi)
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Eclipse template
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders
# Eclipse Core
.project
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Java annotation processor (APT)
.factorypath
# PDT-specific (PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans
# Code Recommenders
.recommenders/
# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
/target
.idea
*.iml
src/main/java/com/xzxtshiro/controller/admin/SysUserController.java
View file @
a7934349
...
...
@@ -307,6 +307,7 @@ public class SysUserController {
for
(
int
i
=
0
;
i
<
idList
.
length
;
i
++){
SysUser
thisUser
=
new
SysUser
();
thisUser
.
setId
(
idList
[
i
]);
thisUser
.
setRoleId
(
user
.
getRoleId
());
userService
.
batchUpdate
(
thisUser
);
}
...
...
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
View file @
a7934349
...
...
@@ -502,7 +502,7 @@
from SYS_USER t
left join
(select u.user_id ,
listagg( roleName, ',' ) within group ( order by u.user_id
) as roleName
xmlagg(xmlparse(content roleName||',' wellformed) order by u.user_id).getclobval(
) as roleName
from sys_role r join sys_user_role u on r.id=u.role_id where u.scbz='0' and r.scbz='0' GROUP BY u.user_id) tt
on t.id=tt.user_id
where scbz='0'
...
...
@@ -548,7 +548,7 @@
from SYS_USER t
left join
(select u.user_id ,
listagg( roleName, ',' ) within group ( order by u.user_id
) as roleName
xmlagg(xmlparse(content roleName||',' wellformed) order by u.user_id).getclobval(
) as roleName
from sys_role r join sys_user_role u on r.id=u.role_id where u.scbz='0' and r.scbz='0' GROUP BY u.user_id) tt
on t.id=tt.user_id
where scbz='0'
...
...
src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java
View file @
a7934349
...
...
@@ -242,20 +242,32 @@ public class SysUserServiceImpl implements SysUserService {
deleteUserZpByUserId
(
user
.
getId
());
addUserZp
(
user
);
}
authorize
(
user
,
dlUser
,
userDao
);
authorize
(
user
,
true
,
dlUser
,
userDao
);
return
user
;
}
//授权操作
public
static
void
authorize
(
SysUser
user
,
SysUser
dlUser
,
SysUserDao
userDao
)
{
//3.删除原有的角色和用户的绑定关系
int
b
=
userDao
.
deleteSysUserRoleByUserId
(
user
.
getId
());
public
static
void
authorize
(
SysUser
user
,
Boolean
flag
,
SysUser
dlUser
,
SysUserDao
userDao
)
{
List
<
String
>
oldRoleIdList
=
null
;
if
(
flag
){
//3.删除原有的角色和用户的绑定关系
int
b
=
userDao
.
deleteSysUserRoleByUserId
(
user
.
getId
());
}
else
{
oldRoleIdList
=
userDao
.
selectSysRoleIdByUserId
(
user
.
getId
());
}
//4.增加新的用户和角色的关系
String
roleIds
=
user
.
getRoleId
();
if
(
roleIds
!=
null
&&!
""
.
equals
(
roleIds
)){
String
[]
roleList
=
roleIds
.
split
(
","
);
List
<
SysUserRole
>
userRoles
=
new
ArrayList
<
SysUserRole
>();
for
(
String
role:
roleList
){
a:
for
(
String
role:
roleList
){
if
(
oldRoleIdList
!=
null
&&
oldRoleIdList
.
size
()>
0
){
b:
for
(
String
oldId:
oldRoleIdList
)
{
if
(
oldId
.
equals
(
role
)){
continue
a
;
}
}
}
SysUserRole
sysUserRole
=
new
SysUserRole
();
sysUserRole
.
setId
(
SequenceUtil
.
getNextXxzjbh
());
sysUserRole
.
setUserId
(
user
.
getId
());
...
...
@@ -279,7 +291,13 @@ public class SysUserServiceImpl implements SysUserService {
@Override
public
SysUser
batchUpdate
(
SysUser
user
)
{
SysUser
dlUser
=
TokenUtil
.
getUser
();
authorize
(
user
,
dlUser
,
userDao
);
/**
* 批量操作存在一个问题,用户原有的角色会被删除,然后再增加新的角色,
* 所以在此需要修改批量授权逻辑,比对每个用户原有的角色,已有,则跳过,
* 没有,则加入批量插入的list
*/
authorize
(
user
,
false
,
dlUser
,
userDao
);
return
user
;
}
...
...
src/main/webapp/WEB-INF/jsp/admin/permission/add.jsp
View file @
a7934349
...
...
@@ -121,7 +121,7 @@
<label
class=
"layui-form-label"
>
父级权限
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"pidName"
id=
"pidName"
class=
"layui-input code-icon"
onclick=
"checkTree('mytree');"
>
class=
"layui-input code-icon"
autocomplete=
"off"
onclick=
"checkTree('mytree');"
>
<input
type=
"text"
id=
"pid"
Name=
"pid"
style=
"display: none;"
>
<
%
--
<
span
class=
"layui-btn"
id=
"checkPer"
onclick=
"checkTree('mytree');"
style=
""
>
选择父级
</span>
--%>
<div
id=
"mytree"
style=
"display: none;"
>
...
...
@@ -133,7 +133,7 @@
<label
class=
"layui-form-label"
>
关联角色
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"roleName"
id=
"roleName"
class=
"layui-input code-icon"
onclick=
"checkTree('myRoleTree');"
>
class=
"layui-input code-icon"
autocomplete=
"off"
onclick=
"checkTree('myRoleTree');"
>
<input
type=
"text"
id=
"roleId"
Name=
"roleId"
style=
"display: none;"
>
<
%
--
<
span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
style=
""
>
选择角色
</span>
--%>
<div
id=
"myRoleTree"
style=
"display: none"
>
...
...
src/main/webapp/WEB-INF/jsp/admin/role/add.jsp
View file @
a7934349
...
...
@@ -74,7 +74,7 @@
<label
class=
"layui-form-label"
>
父级角色
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"pidName"
id=
"pidName"
class=
"layui-input code-icon"
lay-verify=
"required"
onclick=
"checkTree('myRoleTree');"
>
class=
"layui-input code-icon"
autocomplete=
"off"
lay-verify=
"required"
onclick=
"checkTree('myRoleTree');"
>
<input
type=
"text"
id=
"pid"
Name=
"pid"
style=
"display: none;"
>
<
%
--
<
span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
>
选择父级
</span>
--%>
<div
id=
"myRoleTree"
style=
"display: none"
>
...
...
@@ -85,7 +85,7 @@
<div
class=
"layui-form-item btx"
id=
"hasPermission"
>
<label
class=
"layui-form-label"
>
拥有权限
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"permissionName"
id=
"permissionName"
lay-verify=
"required"
<input
type=
"text"
name=
"permissionName"
id=
"permissionName"
autocomplete=
"off"
lay-verify=
"required"
class=
"layui-input code-icon"
onclick=
"checkTree('myPermissionTree');"
>
<input
type=
"text"
id=
"permissionId"
Name=
"permissionId"
style=
"display: none;"
>
<
%
--
<
span
class=
"layui-btn"
id=
"checkPer"
onclick=
"checkTree('myPermissionTree');"
>
选择权限
</span>
--%>
...
...
@@ -139,7 +139,7 @@
$
(
"#isParentRole"
).
removeClass
(
"btx"
);
$
(
"#permissionName"
).
removeAttr
(
'lay-verify'
);
$
(
"#pidName"
).
removeAttr
(
'lay-verify'
);
$
(
"#hasPermission"
).
hide
();
//
$("#hasPermission").hide();
$
(
"#isParentRole"
).
hide
();
}
if
(
data
.
value
==
"02"
){
...
...
src/main/webapp/WEB-INF/jsp/admin/role/update.jsp
View file @
a7934349
...
...
@@ -143,7 +143,7 @@
$
(
"#isParentRole"
).
removeClass
(
"btx"
);
$
(
"#permissionName"
).
removeAttr
(
'lay-verify'
);
$
(
"#pidName"
).
removeAttr
(
'lay-verify'
);
$
(
"#hasPermission"
).
hide
();
//
$("#hasPermission").hide();
$
(
"#isParentRole"
).
hide
();
$
(
"#permissionName"
).
val
(
""
);
$
(
"#permissionId"
).
val
(
""
);
...
...
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
View file @
a7934349
...
...
@@ -87,7 +87,7 @@
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
出生日期
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"birthday"
id=
"birthday"
placeholder=
"请选择出生日期"
<input
type=
"text"
name=
"birthday"
autocomplete=
"off"
id=
"birthday"
placeholder=
"请选择出生日期"
value=
"${user.birthday}"
class=
"layui-input"
>
</div>
</div>
...
...
@@ -132,7 +132,7 @@
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
所属单位
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"unitname"
id=
"unitname"
lay-verify=
"required"
<input
type=
"text"
name=
"unitname"
autocomplete=
"off"
id=
"unitname"
lay-verify=
"required"
class=
"layui-input code-icon"
onclick=
"checkTree('myUnitTree');"
>
<input
type=
"text"
id=
"unitcode"
Name=
"unitcode"
style=
"display: none;"
>
<
%
--
<
span
class=
"layui-btn"
id=
"checkPer"
>
选择单位
</span>
--%>
...
...
@@ -145,7 +145,7 @@
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
用户角色
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"roleName"
id=
"roleName"
lay-verify=
"required"
<input
type=
"text"
name=
"roleName"
id=
"roleName"
autocomplete=
"off"
lay-verify=
"required"
class=
"layui-input code-icon"
onclick=
"checkTree('myRoleTree');"
>
<input
type=
"text"
id=
"roleId"
Name=
"roleId"
style=
"display: none;"
>
<
%
--
<
span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
>
选择角色
</span>
--%>
...
...
src/main/webapp/WEB-INF/jsp/admin/user/batchUpdate.jsp
View file @
a7934349
...
...
@@ -199,10 +199,8 @@
<div
class=
"select-box3 left"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
style=
"position: absolute;left: 50%;margin-left: -71px;"
>
用户角色
</label>
<input
type=
"text"
id=
"batchRoleId"
Name=
"batchRoleId"
style=
"display: none;"
>
<ul
class=
"list-juese"
id=
"batchRoleName"
name=
"batchRoleName"
>
<li>
<input
type=
"text"
id=
"batchRoleId"
Name=
"batchRoleId"
style=
"display: none;"
>
</li>
</ul>
<button
class=
"layui-btn layui-btn-normal"
style=
"position: absolute; left: 50%;bottom: 5px;margin-left: -26px;"
onclick=
"save();"
>
保存
</button>
</div>
...
...
@@ -276,9 +274,6 @@
for
(
var
i
=
0
;
i
<
checkboxs
.
length
;
i
++
)
{
if
(
$
(
checkboxs
[
i
]).
hasClass
(
'layui-form-checked'
))
{
var
idStr
=
""
;
var
that
=
$
(
checkboxs
[
i
]).
parents
(
"tr"
).
clone
();
if
(
!
that
.
find
(
".layui-form-checkbox"
).
hasClass
(
"UserMoved"
))
{
that
.
find
(
".layui-form-checkbox"
).
addClass
(
"UserMoved"
);
...
...
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
View file @
a7934349
...
...
@@ -74,7 +74,7 @@
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
登录密码
</label>
<div
class=
"layui-input-block"
>
<input
type=
"password"
name=
"password"
lay-verify=
"required"
placeholder=
"
默认密码000000
"
value=
"${user.password}"
<input
type=
"password"
name=
"password"
lay-verify=
"required"
placeholder=
""
value=
"${user.password}"
class=
"layui-input"
>
</div>
</div>
...
...
@@ -93,13 +93,13 @@
class=
"layui-input"
>
</div>
</div>
--%>
<
%
--
<
div
class=
"layui-form-item btx"
>
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
联系电话
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
name=
"telephone"
lay-verify=
"phone"
placeholder=
"请输入联系电话"
value=
"${user.telephone}"
class=
"layui-input"
>
</div>
</div>
--%>
</div>
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
用户警号
</label>
<div
class=
"layui-input-block"
>
...
...
src/main/webapp/resources/common/common.js
View file @
a7934349
...
...
@@ -41,18 +41,23 @@ function setTree(data,treeId,type,kid,vid,glcs) {
onCheck
:
function
(
e
,
treeId
)
{
var
treeObj
=
$
.
fn
.
zTree
.
getZTreeObj
(
treeId
),
nodes
=
treeObj
.
getCheckedNodes
(
true
),
v
=
""
,
k
=
""
;
v
=
""
,
k
=
""
,
vStr
=
""
;
for
(
var
i
=
0
;
i
<
nodes
.
length
;
i
++
){
var
thisName
=
nodes
[
i
].
name
;
if
(
thisName
.
indexOf
(
"["
)
>-
1
){
thisName
=
thisName
.
substring
(
0
,
thisName
.
indexOf
(
"["
));
}
if
(
vid
==
"batchRoleName"
){
$
(
"#batchRoleName"
).
append
(
"<li>"
+
thisName
+
"</li>"
);
vStr
+=
"<li>"
+
thisName
+
"</li>"
}
v
+=
thisName
+
","
;
k
+=
nodes
[
i
].
id
+
","
;
}
if
(
vid
==
"batchRoleName"
){
//消除迭代影响
$
(
"#batchRoleName"
).
empty
();
$
(
"#batchRoleName"
).
append
(
vStr
);
}
$
(
"#"
+
kid
).
val
(
k
);
$
(
"#"
+
vid
).
val
(
v
);
// closeTree();
...
...
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